Imported Upstream version 15.0.0

[platform/upstream/libzypp.git] / zypp / KeyRing.cc

diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index 9f52b6f..3523b45 100644 (file)
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -222,7 +222,11 @@ namespace zypp
     PublicKey exportTrustedPublicKey( const PublicKeyData & keyData )
     { return exportKey( keyData, trustedKeyRing() ); }
 
-    bool verifyFileSignatureWorkflow( const Pathname & file, const std::string & filedesc, const Pathname & signature, bool & sigValid_r, const KeyContext & keycontext = KeyContext());
+    bool verifyFileSignatureWorkflow(
+        const Pathname & file,
+        const std::string & filedesc,
+        const Pathname & signature,
+        const KeyContext & keycontext = KeyContext());
 
     bool verifyFileSignature( const Pathname & file, const Pathname & signature )
     { return verifyFile( file, signature, generalKeyRing() ); }
@@ -376,10 +380,12 @@ namespace zypp
     return tmpFile;
   }
 
-  bool KeyRing::Impl::verifyFileSignatureWorkflow( const Pathname & file, const std::string & filedesc, const Pathname & signature, bool & sigValid_r, const KeyContext & context )
+  bool KeyRing::Impl::verifyFileSignatureWorkflow(
+      const Pathname & file,
+      const std::string & filedesc,
+      const Pathname & signature,
+      const KeyContext & context )
   {
-    sigValid_r = false;        // set true if signature is actually successfully validated!
-
     callback::SendReport<KeyRingReport> report;
     MIL << "Going to verify signature for " << filedesc << " ( " << file << " ) with " << signature << endl;
 
@@ -422,9 +428,7 @@ namespace zypp
 
       // it exists, is trusted, does it validates?
       if ( verifyFile( file, signature, trustedKeyRing() ) )
-      {
-        return (sigValid_r=true);      // signature is actually successfully validated!
-      }
+        return true;
       else
       {
         return report->askUserToAcceptVerificationFailed( filedesc, exportKey( trustedKeyData, trustedKeyRing() ), context );
@@ -461,7 +465,7 @@ namespace zypp
           if ( verifyFile( file, signature, whichKeyring ) )
           {
             MIL << "File signature is verified" << endl;
-           return (sigValid_r=true);   // signature is actually successfully validated!
+            return true;
           }
           else
           {
@@ -700,11 +704,12 @@ namespace zypp
   std::list<PublicKeyData> KeyRing::trustedPublicKeyData()
   { return _pimpl->trustedPublicKeyData(); }
 
-  bool KeyRing::verifyFileSignatureWorkflow( const Pathname & file, const std::string & filedesc, const Pathname & signature, bool & sigValid_r, const KeyContext & keycontext )
-  { return _pimpl->verifyFileSignatureWorkflow( file, filedesc, signature, sigValid_r, keycontext ); }
-
-  bool KeyRing::verifyFileSignatureWorkflow( const Pathname & file, const std::string filedesc, const Pathname & signature, const KeyContext & keycontext )
-  { bool unused; return _pimpl->verifyFileSignatureWorkflow( file, filedesc, signature, unused, keycontext ); }
+  bool KeyRing::verifyFileSignatureWorkflow(
+      const Pathname & file,
+      const std::string filedesc,
+      const Pathname & signature,
+      const KeyContext & keycontext )
+  { return _pimpl->verifyFileSignatureWorkflow( file, filedesc, signature, keycontext ); }
 
   bool KeyRing::verifyFileSignature( const Pathname & file, const Pathname & signature )
   { return _pimpl->verifyFileSignature( file, signature ); }