[git] GPGME - branch, master, updated. gpgme-1.6.0-186-g15fc5c3

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  15fc5c34c88ecbb61272705af60f7054b41c57f7 (commit)
       via  82d484c852d07958ac93efb3d2d7b7726fbb5231 (commit)
      from  3364549c19682f56d4d9c52ab7f76862c5a456cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15fc5c34c88ecbb61272705af60f7054b41c57f7
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jun 27 15:50:01 2016 +0200

    Cpp: Expose new data_identify values
    
    * lang/cpp/src/data.cpp (GpgME::Data::type): Handle PGP Encrypted
     and Signature.
    * lang/cpp/src/data.h: Add values accordingly.

diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
index bf9a629..af1c479 100644
--- a/lang/cpp/src/data.cpp
+++ b/lang/cpp/src/data.cpp
@@ -178,6 +178,8 @@ GpgME::Data::Type GpgME::Data::type() const
     case GPGME_DATA_TYPE_CMS_OTHER:     return CMSOther;
     case GPGME_DATA_TYPE_X509_CERT:     return X509Cert;
     case GPGME_DATA_TYPE_PKCS12:        return PKCS12;
+    case GPGME_DATA_TYPE_PGP_ENCRYPTED: return PGPEncrypted;
+    case GPGME_DATA_TYPE_PGP_SIGNATURE: return PGPSignature;
     }
     return Invalid;
 }
diff --git a/lang/cpp/src/data.h b/lang/cpp/src/data.h
index efb1e79..d5e54aa 100644
--- a/lang/cpp/src/data.h
+++ b/lang/cpp/src/data.h
@@ -92,7 +92,9 @@ public:
         CMSEncrypted,
         CMSOther,
         X509Cert,
-        PKCS12
+        PKCS12,
+        PGPEncrypted,
+        PGPSignature,
     };
     Type type() const;
 

commit 82d484c852d07958ac93efb3d2d7b7726fbb5231
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jun 27 14:47:44 2016 +0200

    Cpp: Do not treat KEYEXPIRED as error
    
    * lang/cpp/src/editinteractor.cpp (status_to_error): No error
    for KEYEXPIRED.
    
    --
    As keyexpired status is sent even if a subkey is expired
    we can not treat it as a global error.

diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index d2633b5..07dc26d 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -222,8 +222,6 @@ Error status_to_error(unsigned int status)
         return Error::fromCode(GPG_ERR_NO_PASSPHRASE);
     case GPGME_STATUS_ALREADY_SIGNED:
         return Error::fromCode(GPG_ERR_ALREADY_SIGNED);
-    case GPGME_STATUS_KEYEXPIRED:
-        return Error::fromCode(GPG_ERR_CERT_EXPIRED);
     case GPGME_STATUS_SIGEXPIRED:
         return Error::fromCode(GPG_ERR_SIG_EXPIRED);
     }

-----------------------------------------------------------------------

Summary of changes:
 lang/cpp/src/data.cpp           | 2 ++
 lang/cpp/src/data.h             | 4 +++-
 lang/cpp/src/editinteractor.cpp | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org