Changeset 333

Timestamp:

01/20/06 09:02:19

Author:

ben

Message:

Beginnings of decryption.

Files:

• openpgpsdk/trunk/examples/Makefile.template (modified) (2 diffs)
• openpgpsdk/trunk/examples/decrypt.c (added)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (2 diffs)
• openpgpsdk/trunk/src/Makefile.template (modified) (1 diff)
• openpgpsdk/trunk/src/create.c (modified) (2 diffs)
• openpgpsdk/trunk/src/packet-parse.c (modified) (1 diff)
• openpgpsdk/trunk/src/packet-show.c (modified) (1 diff)

openpgpsdk/trunk/examples/Makefile.template

@@ -8 +8 @@
-LIBS=$(LIBDEPS) %CRYPTO_LIBS% %ZLIB% $(DM_LIB) %LIBS%
-EXES=packet-dump verify create-key create-signed-key verify2 sign-detached \
-
+ decrypt
-
-all: Makefile .depend $(EXES)
@@ -37 +37 @@
-sign-inline: sign-inline.o $(LIBDEPS)
-        $(CC) $(LDFLAGS) -o sign-inline sign-inline.o $(LIBS)
+
+decrypt: decrypt.o $(LIBPDEPS)
+        $(CC) $(LDFLAGS) -o decrypt decrypt.o $(LIBS)
+
-
-tags:

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -46 +46 @@
-                            const ops_rsa_public_key_t *rsa);
-
+unsigned ops_block_size(ops_symmetric_algorithm_t alg);
+
-#endif

openpgpsdk/trunk/include/openpgpsdk/packet.h

@@ -344 +344 @@
-typedef enum
-    {
-
+
+
+
-    } ops_s2k_usage_t;
+
+/** s2k_specifier_t
+ */
+typedef enum
+    {
+    OPS_S2KS_SIMPLE=0,
+    OPS_S2KS_SALTED=1,
+    OPS_S2KS_ITERATED_AND_SALTED=3
+    } ops_s2k_specifier_t;
+
+/** Symmetric Key Algorithm Numbers.
+ * OpenPGP assigns a unique Algorithm Number to each algorithm that is part of OpenPGP.
+ *
+ * This lists algorithm numbers for symmetric key algorithms.
+ * 
+ * \see RFC2440bis-12 9.2
+ */
+typedef enum
+    {
+    OPS_SA_PLAINTEXT    =0, /*!< Plaintext or unencrypted data */
+    OPS_SA_IDEA         =1, /*!< IDEA */
+    OPS_SA_TRIPLEDES    =2, /*!< TripleDES */
+    OPS_SA_CAST5        =3, /*!< CAST5 */
+    OPS_SA_BLOWFISH     =4, /*!< Blowfish */
+    OPS_SA_AES_128      =7, /*!< AES with 128-bit key (AES) */
+    OPS_SA_AES_192      =8, /*!< AES with 192-bit key */
+    OPS_SA_AES_256      =9, /*!< AES with 256-bit key */
+    OPS_SA_TWOFISH      =10, /*!< Twofish with 256-bit key (TWOFISH) */
+    } ops_symmetric_algorithm_t;
+
+// Maximum block size for symmetric crypto
+#define OPS_MAX_BLOCK_SIZE      16
-
-/** ops_secret_key_t
@@ -353 +387 @@
-    ops_public_key_t            public_key;
-    ops_s2k_usage_t             s2k_usage;
+    ops_symmetric_algorithm_t   algorithm;
+    unsigned char               iv[OPS_MAX_BLOCK_SIZE];
-    unsigned                    checksum;
-    ops_secret_key_union_t      key;
-    } ops_secret_key_t;
-
-/** Symmetric Key Algorithm Numbers.
- * OpenPGP assigns a unique Algorithm Number to each algorithm that is part of OpenPGP.
- *
- * This lists algorithm numbers for symmetric key algorithms.
- * 
- * \see RFC2440bis-12 9.2
- */
-typedef enum
-    {
-    OPS_SKA_PLAINTEXT   =0, /*!< Plaintext or unencrypted data */
-    OPS_SKA_IDEA        =1, /*!< IDEA */
-    OPS_SKA_TRIPLEDES   =2, /*!< TripleDES */
-    OPS_SKA_CAST5       =3, /*!< CAST5 */
-    OPS_SKA_BLOWFISH    =4, /*!< Blowfish */
-    OPS_SKA_AES_128     =7, /*!< AES with 128-bit key (AES) */
-    OPS_SKA_AES_192     =8, /*!< AES with 192-bit key */
-    OPS_SKA_AES_256     =9, /*!< AES with 256-bit key */
-    OPS_SKA_TWOFISH     =10, /*!< Twofish with 256-bit key (TWOFISH) */
-
-    } ops_symmetric_key_algorithm_t;
-
-/** Structure to hold one trust packet's data */

openpgpsdk/trunk/src/Makefile.template

@@ -11 +11 @@
-LIBOBJS = packet-parse.o util.o openssl_crypto.o accumulate.o \
-        memory.o fingerprint.o hash.o keyring.o signature.o compress.o \
-
+
+
-
-headers:

openpgpsdk/trunk/src/create.c

@@ -327 +327 @@
-    
-    // XXX: for now, no secret key encryption, so s2k == 0
-
+U
-
-    push_secret_key_checksum_writer(info);
@@ -466 +466 @@
-    key->key.rsa.u=u;
-
-
+U
-
-    // XXX: sanity check and add errors...

openpgpsdk/trunk/src/packet-parse.c

@@ -1753 +1753 @@
-        return 0;
-    C.secret_key.s2k_usage=c[0];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    switch(C.secret_key.public_key.algorithm)

openpgpsdk/trunk/src/packet-show.c

@@ -129 +129 @@
-static ops_map_t symmetric_key_algorithm_map[] =
-    {
-KA_PLAINTEXT,
-K
-KA_TRIPLEDES,
-K
-K
-K
-K
-K
-K
+A_PLAINTEXT,        
+
+A_TRIPLEDES,        
+
+
+
+
+
+
-    { (int) NULL,               (char *)NULL }, /* this is the end-of-array marker */
-    };