X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=openpgp.h;h=f78f10c320e65ac13958feb7128ee029252bc8cb;hb=c04c1c60469823c01268187ec49102d1ff540806;hp=5ac2ee2a428a428f406048979d4d5256d67e57c1;hpb=8337392d1507b70c6e3e6c6523b6eb8a843a7395;p=onak.git

diff --git a/openpgp.h b/openpgp.h
index 5ac2ee2..f78f10c 100644
--- a/openpgp.h
+++ b/openpgp.h
@@ -21,24 +21,65 @@
 #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_EC		18
+#define OPENPGP_PKALGO_ECDSA		19
 #define OPENPGP_PKALGO_ELGAMAL_SIGN	20
+#define OPENPGP_PKALGO_DH		21
+
+#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_SAFER_SK128	5	/* In RFC2440, not in RFC4880 */
+#define OPENPGP_SYMALGO_DES_SK		6	/* In RFC2440, not in RFC4880 */
+#define OPENPGP_SYMALGO_AES128		7
+#define OPENPGP_SYMALGO_AES192		8
+#define OPENPGP_SYMALGO_AES256		9
+#define OPENPGP_SYMALGO_TWOFISH		10
+#define OPENPGP_SYMALGO_CAMELLIA128	11	/* From GnuPG */
+#define OPENPGP_SYMALGO_CAMELLIA192	12	/* From GnuPG */
+#define OPENPGP_SYMALGO_CAMELLIA256	13	/* From GnuPG */
 
 #define OPENPGP_HASH_MD5		1
 #define OPENPGP_HASH_SHA1		2
 #define OPENPGP_HASH_RIPEMD160		3
+#define OPENPGP_HASH_SHA1X		4	/* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_MD2		5	/* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_TIGER192		6	/* In RFC2440, not in RFC4880 */
+#define OPENPGP_HASH_HAVAL_5_160	7	/* In RFC2440, not in RFC4880 */
 #define OPENPGP_HASH_SHA256		8
 #define OPENPGP_HASH_SHA384		9
 #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_SYMSESSIONKEY	3
+#define OPENPGP_PACKET_ONEPASSSIG	4
+#define OPENPGP_PACKET_SECRETKEY	5
 #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_ENCRYPTED_MDC	18
+#define OPENPGP_PACKET_MDC		19
+#define OPENPGP_PACKET_COMMENT		61
 
 #define OPENPGP_SIGTYPE_BINARY		0x00
 #define OPENPGP_SIGTYPE_TEXT		0x01