Provide additional keys data in case the ASCII armored blob containes multiple keys

diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
index 7fe3ba4d28a7f8972aa277ac7d5123b6f6ad2544..6996cd13907f2095ced0f99c660f2a647efca3c3 100644 (file)
--- a/zypp/PublicKey.cc
+++ b/zypp/PublicKey.cc
@@ -311,6 +311,9 @@ namespace zypp
       Pathname path() const
       { return _dataFile.path(); }
 
+      const std::list<PublicKeyData> & hiddenKeys() const
+      { return _hiddenKeys; }
+
     protected:
       void readFromFile()
       {
@@ -354,20 +357,25 @@ namespace zypp
 
          case 1:
            // ok.
+           _keyData = scanner._keys.back();
+           _hiddenKeys.clear();
            break;
 
          default:
            WAR << "File " << _dataFile.path().asString() << " contains multiple keys: " <<  scanner._keys << endl;
+           _keyData = scanner._keys.back();
+           scanner._keys.pop_back();
+           _hiddenKeys.swap( scanner._keys );
            break;
        }
 
-       _keyData = scanner._keys.back();
        MIL << "Read pubkey from " << info.path() << ": " << _keyData << endl;
       }
 
     private:
       filesystem::TmpFile      _dataFile;
       PublicKeyData            _keyData;
+      std::list<PublicKeyData>  _hiddenKeys;
 
     public:
       /** Offer default Impl. */
@@ -413,6 +421,9 @@ namespace zypp
   Pathname PublicKey::path() const
   { return _pimpl->path(); }
 
+  const std::list<PublicKeyData> & PublicKey::hiddenKeys() const
+  { return _pimpl->hiddenKeys(); }
+
   std::string PublicKey::id() const
   { return keyData().id(); }
 

diff --git a/zypp/PublicKey.h b/zypp/PublicKey.h
index 036f0760c4852a5ff1e2a73b1ee657343bf18934..5f81d13d104af0f14a46c931c3dbe5c084976531 100644 (file)
--- a/zypp/PublicKey.h
+++ b/zypp/PublicKey.h
@@ -197,8 +197,13 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////
   /// \class PublicKey
   /// \brief Class representing one GPG Public Key (PublicKeyData + ASCII armored in a tempfile).
+  ///
   /// If you don't need the ASCII armored version of the key stored in
   /// a tempfile, using \ref PublicKeyData might be sufficient.
+  ///
+  /// \note In case the ASCII armored blob actually contains multiple
+  /// keys, the \b last keys data are made available via the API. The
+  /// additional keys data are made available via \ref hiddenKeys.
   ///////////////////////////////////////////////////////////////////
   class PublicKey
   {
@@ -249,11 +254,13 @@ namespace zypp
     std::string gpgPubkeyRelease() const;      //!< \see \ref PublicKeyData
     std::string asString() const;              //!< \see \ref PublicKeyData
 
-
   public:
     /** File containig the ASCII armored key. */
     Pathname path() const;
 
+    /** Additional keys data in case the ASCII armored blob containes multiple keys. */
+    const std::list<PublicKeyData> & hiddenKeys() const;
+
   public:
     bool operator==( PublicKey rhs ) const;    // FIXME: change arg to const&
     bool operator==( std::string sid ) const;  // FIXME: change arg to const&