summary history branches tags files
commit:08984b34652d7ad1338e7bdd0929e640b66d45aa
author:mrmekon
committer:mrmekon
date:Thu Nov 3 21:43:37 2011 -0400
parents:761fab6c94200c7f2f15ead5eb6597817977ac2f
Public key split out of secret key.
diff --git a/src/packet.h b/src/packet.h
line changes: +7/-1
index 42f4d3a..cb10355
--- a/src/packet.h
+++ b/src/packet.h
@@ -55,7 +55,6 @@ struct spgp_public_packet_struct {
 	uint8_t version;
   uint32_t creationTime;
 	uint8_t asymAlgo;
-  uint8_t symAlgo;
   spgp_mpi_t *mpiHead;
   uint8_t mpiCount;
   uint8_t *fingerprint;
@@ -129,6 +128,13 @@ typedef enum {
   HASH_ALGO_SHA224,
 } spgp_hash_algo_t;
 
+typedef enum {
+	S2K_TYPE_SIMPLE            = 1,
+  S2K_TYPE_SALTED,
+  S2K_TYPE_RESERVED,
+  S2K_TYPE_ITERATED,
+} spgp_s2k_type_t;
+
 spgp_packet_t *spgp_decode_message(uint8_t *message, uint32_t length);
 void spgp_free_packet(spgp_packet_t **pkt);