Add some more OpenPGP related constants

Extra packet types, the compression types and the symmetric algorithms.

diff --git a/keyindex.c b/keyindex.c
index 45606f0d50fb5f1e206736ebf84dca60ed657074..8de8b233e50c8f57f413fe713e0c2538e77f2824 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -158,7 +158,7 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
                        printf("sub  %5d%c/%08X %04d/%02d/%02d\n",
                                length,
                                (type == OPENPGP_PKALGO_RSA) ? 'R' :
                        printf("sub  %5d%c/%08X %04d/%02d/%02d\n",
                                length,
                                (type == OPENPGP_PKALGO_RSA) ? 'R' :

-                               ((type == OPENPGP_PKALGO_ELGAMAL) ? 'g' :
+                               ((type == OPENPGP_PKALGO_ELGAMAL_ENC) ? 'g' :

                                ((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
                                (uint32_t) (get_packetid(subkeys->packet) &
                                            0xFFFFFFFF),
                                ((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
                                (uint32_t) (get_packetid(subkeys->packet) &
                                            0xFFFFFFFF),


@@ -281,7 +281,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                case OPENPGP_PKALGO_RSA:
                        typech = 'R';
                        break;
                case OPENPGP_PKALGO_RSA:
                        typech = 'R';
                        break;

-               case OPENPGP_PKALGO_ELGAMAL:
+               case OPENPGP_PKALGO_ELGAMAL_ENC:

                        typech = 'g';
                        break;
                case OPENPGP_PKALGO_DSA:
                        typech = 'g';
                        break;
                case OPENPGP_PKALGO_DSA:

diff --git a/openpgp.h b/openpgp.h
index 5ac2ee2a428a428f406048979d4d5256d67e57c1..1d40533cc350cb6f53e6cb504f446002728701e5 100644 (file)
--- a/openpgp.h
+++ b/openpgp.h
@@ -21,10 +21,22 @@
 #define __OPENPGP_H__
 
 #define OPENPGP_PKALGO_RSA             1
 #define __OPENPGP_H__
 
 #define OPENPGP_PKALGO_RSA             1

-#define OPENPGP_PKALGO_ELGAMAL         16
+#define OPENPGP_PKALGO_RSA_ENC         2
+#define OPENPGP_PKALGO_RSA_SIGN                3
+#define OPENPGP_PKALGO_ELGAMAL_ENC     16

 #define OPENPGP_PKALGO_DSA             17
 #define OPENPGP_PKALGO_ELGAMAL_SIGN    20
 
 #define OPENPGP_PKALGO_DSA             17
 #define OPENPGP_PKALGO_ELGAMAL_SIGN    20
 

+#define OPENPGP_SYMALGO_PLAIN          0
+#define OPENPGP_SYMALGO_IDEA           1
+#define OPENPGP_SYMALGO_3DES           2
+#define OPENPGP_SYMALGO_CAST5          3
+#define OPENPGP_SYMALGO_BLOWFISH       4
+#define OPENPGP_SYMALGO_AES128         7
+#define OPENPGP_SYMALGO_AES192         8
+#define OPENPGP_SYMALGO_AES256         9
+#define OPENPGP_SYMALGO_TWOFISH                10
+

 #define OPENPGP_HASH_MD5               1
 #define OPENPGP_HASH_SHA1              2
 #define OPENPGP_HASH_RIPEMD160         3
 #define OPENPGP_HASH_MD5               1
 #define OPENPGP_HASH_SHA1              2
 #define OPENPGP_HASH_RIPEMD160         3


@@ -33,12 +45,29 @@
 #define OPENPGP_HASH_SHA512            10
 #define OPENPGP_HASH_SHA224            11
 
 #define OPENPGP_HASH_SHA512            10
 #define OPENPGP_HASH_SHA224            11
 

+#define OPENPGP_COMP_NONE              0
+#define OPENPGP_COMP_ZIP               1
+#define OPENPGP_COMP_ZLIB              2
+#define OPENPGP_COMP_BZIP2             3
+
+#define OPENPGP_PACKET_PKSESSIONKEY    1

 #define OPENPGP_PACKET_SIGNATURE       2
 #define OPENPGP_PACKET_SIGNATURE       2

+#define OPENPGP_PACKET_SYMSESSIONKEY   3
+#define OPENPGP_PACKET_ONEPASSSIG      4
+#define OPENPGP_PACKET_SECRETKEY       5

 #define OPENPGP_PACKET_PUBLICKEY       6
 #define OPENPGP_PACKET_PUBLICKEY       6

+#define OPENPGP_PACKET_SECRETSUBKEY    7
+#define OPENPGP_PACKET_COMPRESSED      8
+#define OPENPGP_PACKET_ENCRYPTED       9
+#define OPENPGP_PACKET_MARKER          10
+#define OPENPGP_PACKET_LITERALDATA     11

 #define OPENPGP_PACKET_TRUST           12
 #define OPENPGP_PACKET_UID             13
 #define OPENPGP_PACKET_PUBLICSUBKEY    14
 #define OPENPGP_PACKET_UAT             17
 #define OPENPGP_PACKET_TRUST           12
 #define OPENPGP_PACKET_UID             13
 #define OPENPGP_PACKET_PUBLICSUBKEY    14
 #define OPENPGP_PACKET_UAT             17

+#define OPENPGP_PACKET_ENCRYPTED_MDC   18
+#define OPENPGP_PACKET_MDC             19
+#define OPENPGP_PACKET_COMMENT         61

 
 #define OPENPGP_SIGTYPE_BINARY         0x00
 #define OPENPGP_SIGTYPE_TEXT           0x01
 
 #define OPENPGP_SIGTYPE_BINARY         0x00
 #define OPENPGP_SIGTYPE_TEXT           0x01