Use nettle for hashing when available rather than internal MD5/SHA1 routines

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 0b72e5b918699c98414863e64bb3e322d078bd21..5b2092e024c0b6016e9a77b679fc1c8006f2f019 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -82,16 +82,10 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
                                *creation = data[offset + packetlen - 1];
                        }
                        break;
-               case OPENPGP_SIGSUB_EXPIRY:
                        /*
                         * Signature expiration time. Might want to output this?
                         */
                        break;
-               case OPENPGP_SIGSUB_REGEX:
-                       /*
-                        * Regular expression for UIDs this sig is over.
-                        */
-                       break;
                case OPENPGP_SIGSUB_ISSUER:
                        if (keyid != NULL) {
                                *keyid = data[offset+packetlen - 8];
@@ -111,25 +105,23 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation)
                                *keyid += data[offset+packetlen - 1];
                        }
                        break;
+               case OPENPGP_SIGSUB_EXPIRY:
+               case OPENPGP_SIGSUB_EXPORTABLE:
+               case OPENPGP_SIGSUB_TRUSTSIG:
+               case OPENPGP_SIGSUB_REGEX:
+               case OPENPGP_SIGSUB_KEYEXPIRY:
+               case OPENPGP_SIGSUB_PREFSYM:
                case OPENPGP_SIGSUB_NOTATION:
-                       /*
-                        * Annotation data.
-                        */
-                       break;
-
+               case OPENPGP_SIGSUB_PREFHASH:
+               case OPENPGP_SIGSUB_PREFCOMPRESS:
                case OPENPGP_SIGSUB_KEYSERVER:
-                       /*
-                        * Key server preferences. Including no-modify.
-                        */
-                       break;
                case OPENPGP_SIGSUB_PRIMARYUID:
-                       /*
-                        * Primary UID.
-                        */
-                       break;
                case OPENPGP_SIGSUB_POLICYURI:
+               case OPENPGP_SIGSUB_KEYFLAGS:
                        /*
-                        * Policy URI.
+                        * Various subpacket types we know about, but don't
+                        * currently handle. Some are candidates for being
+                        * supported if we add signature checking support.
                         */
                        break;
                default: