Changeset 563

Timestamp:

05/22/08 16:13:30

Author:

rachel

Message:

Use Salted S2K

Files:

• openpgpsdk/trunk/src/lib/adv_create.c (modified) (5 diffs)
• openpgpsdk/trunk/src/lib/adv_openssl_crypto.c (modified) (1 diff)

openpgpsdk/trunk/src/lib/adv_create.c

@@ -382 +382 @@
-        return ops_false;
-
-); // = 1 \todo should be salted or
+ || key->s2k_specifier==OPS_S2KS_SALTED); // = 1 \todo could also be
-    if (!ops_write_scalar(key->s2k_specifier,1,info))
-        return ops_false;
@@ -396 +396 @@
-        break;
-
+    case OPS_S2KS_SALTED:
+        // 8-octet salt value
+        ops_random((void *)&key->salt[0],OPS_SALT_SIZE);
+        if (!ops_write(key->salt, OPS_SALT_SIZE, info))
+            return ops_false;
+        break;
+
-        /* \todo
-    case OPS_S2KS_SALTED:
-    // 8-octet salt value
-        break;
-
-    case OPS_S2KS_ITERATED_AND_SALTED:
-    // 8-octet salt value
@@ -420 +423 @@
-        {
-    case OPS_S2KS_SIMPLE:
-
+
+
-
-        done=0;
@@ -439 +443 @@
-                }
-
+            if (key->s2k_specifier==OPS_S2KS_SALTED)
+                { hash.add(&hash, key->salt, OPS_SALT_SIZE); }
+
-            hash.add(&hash, passphrase, pplen);
-            hash.finish(&hash, hashed);
@@ -451 +458 @@
-
-        /* \todo
-    case OPS_S2KS_SALTED:
-    // 8-octet salt value
-        break;
-
-    case OPS_S2KS_ITERATED_AND_SALTED:
-    // 8-octet salt value

openpgpsdk/trunk/src/lib/adv_openssl_crypto.c

@@ -305 +305 @@
-
-    skey->s2k_usage=OPS_S2KU_ENCRYPTED_AND_HASHED;
-// \todo     skey->s2k_specifier_t
-
+skey->s2k_specifier
+//
-    skey->algorithm=OPS_SA_CAST5; // \todo make param
-    skey->hash_algorithm=OPS_HASH_SHA1; // \todo make param