Converted .hgignore to .gitignore

- Introduce PEP_VERIFY_SIGNER_KEY_EXPIRED and
    PEP_VERIFY_SIGNER_KEY_INVALID.

  - Have pgp_decrypt_and_verify and pgp_verify_text returns them, when
    appropriate.

.gitignore

@@ -1,14 +1,12 @@
-syntax: regexp
-^asn\.1/.*\.(c|h)$
-^asn\.1/libasn1\.a$
-.*xcuserdata/
-^build/
-^local.conf
-^test_home/
-
-syntax: glob
 asn.1/Makefile.am.*
 asn.1/converter-example.mk
+asn.1/libasn1.a
+local.conf
+build/
+test_home/
+asn.1/*.c
+asn.1/*.h
+xcuserdata/
 *.orig
 *.old
 *.d
@@ -88,3 +86,16 @@ lldb-history
 test/EngineTests
 test/googletest
 test/tmp/*
+
+# ignore generated test data
+
+test/655_16F07F382FB3CF5DF977005D1069C7CACF9C23C6.asc
+test/655_5FBDE3C9E10552B1DD6D9763E89759391DE04053.asc
+test/655_EB4308E2D5B9FEEF7488D14CFEE4AE51914D566D.asc
+test/655_ECBA9555D9ADB1B68861B508032CCA777FFDBA14.asc
+test/655_decrypted_only.eml
+test/703_key_valid.asc
+test/test_keys/736_a.asc
+test/test_keys/736_b.asc
+test/test_mails/ENGINE-654_bob_mail.eml
+

src/pEpEngine.h

@@ -85,6 +85,8 @@ typedef enum {
     PEP_VERIFIED_AND_TRUSTED                        = 0x0408,
     PEP_CANNOT_REENCRYPT                            = 0x0409,
     PEP_VERIFY_SIGNER_KEY_REVOKED                   = 0x040a,
+    PEP_VERIFY_SIGNER_KEY_EXPIRED                   = 0x040b,
+    PEP_VERIFY_SIGNER_KEY_INVALID                   = 0x040c,
     PEP_CANNOT_DECRYPT_UNKNOWN                      = 0x04ff,
 
 

src/pgp_sequoia.c

@@ -1541,11 +1541,11 @@ PEP_STATUS pgp_decrypt_and_verify(
             status = PEP_VERIFY_SIGNER_KEY_REVOKED;
         } else if (cookie.expired_key) {
             // If there are any signatures from expired keys, fail.
-            status = PEP_DECRYPTED;
+            status = PEP_VERIFY_SIGNER_KEY_EXPIRED;
         } else if (cookie.bad_key) {
             // If there are any signatures from invalid keys (keys
             // that are not signing capable), fail.
-            status = PEP_DECRYPTED;
+            status = PEP_VERIFY_SIGNER_KEY_INVALID;
         } else if (cookie.bad_checksums) {
             // If there are any bad signatures, fail.
             status = PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH;
@@ -1671,11 +1671,11 @@ PEP_STATUS pgp_verify_text(
             status = PEP_VERIFY_SIGNER_KEY_REVOKED;
         } else if (cookie.expired_key) {
             // If there are any signatures from expired keys, fail.
-            status = PEP_DECRYPTED;
+            status = PEP_VERIFY_SIGNER_KEY_EXPIRED;
         } else if (cookie.bad_key) {
             // If there are any signatures from invalid keys (keys
             // that are not signing capable), fail.
-            status = PEP_DECRYPTED;
+            status = PEP_VERIFY_SIGNER_KEY_INVALID;
         } else if (cookie.bad_checksums) {
             // If there are any bad signatures, fail.
             status = PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH;