Changeset 9a0d25d

Timestamp:

Feb 3, 2019, 8:58:44 PM (5 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

40def31a, 7aa6811, 8861654, c2a8e22, 35cdda2

Parents:

238c3a5

git-author:

Anders Kaseorg <andersk@mit.edu> (01/31/19 02:09:10)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/03/19 20:58:44)

Message:

Migrate to “new” OpenSSL DES API

The new API was added in OpenSSL 0.9.7.  The old API was removed in
OpenSSL 1.1.0.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• configure.ac (modified) (1 diff)
• zcrypt.c (modified) (6 diffs)

configure.ac

@@ -82 +82 @@
 AC_CHECK_FUNCS([use_default_colors])
 AC_CHECK_FUNCS([resizeterm], [], [AC_MSG_ERROR([No resizeterm found])])
-AC_CHECK_FUNCS([des_string_to_key DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
-AC_CHECK_FUNCS([des_ecb_encrypt DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
-AC_CHECK_FUNCS([des_key_sched DES_key_sched], [HAVE_DES_KEY_SCHED=1])
+AC_CHECK_FUNCS([DES_string_to_key], [HAVE_DES_STRING_TO_KEY=1])
+AC_CHECK_FUNCS([DES_ecb_encrypt], [HAVE_DES_ECB_ENCRYPT=1])
+AC_CHECK_FUNCS([DES_key_sched], [HAVE_DES_KEY_SCHED=1])
 
 dnl Checks for header files.

zcrypt.c

@@ -95 +95 @@
 };
 
-static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
-  des_cblock key;
-
-  des_string_to_key(keystring, &key);
-  des_key_sched(&key, *schedule);
+static void owl_zcrypt_string_to_schedule(char *keystring, DES_key_schedule *schedule) {
+  DES_cblock key;
+
+  DES_string_to_key(keystring, &key);
+  DES_key_sched(&key, schedule);
 }
 
@@ -720 +720 @@
 int do_encrypt_des(const char *keyfile, const char *in, int length, FILE *outfile)
 {
-  des_key_schedule schedule;
+  DES_key_schedule schedule;
   unsigned char input[8], output[8];
   const char *inptr;
@@ -766 +766 @@
 
     /* Encrypt and output the block */
-    des_ecb_encrypt(&input, &output, schedule, TRUE);
+    DES_ecb_encrypt(&input, &output, &schedule, TRUE);
     block_to_ascii(output, outfile);
 
@@ -905 +905 @@
 
 int do_decrypt_des(const char *keyfile) {
-  des_key_schedule schedule;
+  DES_key_schedule schedule;
   unsigned char input[8], output[8];
   char tmp[9];
@@ -915 +915 @@
     have a NULL-terminated string we can call printf/strlen on.
 
-    We don't pass 'tmp' to des_ecb_encrypt directly, because it's
+    We don't pass 'tmp' to DES_ecb_encrypt directly, because it's
     prototyped as taking 'unsigned char[8]', and this avoids a stupid
     cast.
@@ -933 +933 @@
   while (read_ascii_block(input))
   {
-    des_ecb_encrypt(&input, &output, schedule, FALSE);
+    DES_ecb_encrypt(&input, &output, &schedule, FALSE);
     memcpy(tmp, output, 8);
     printf("%s", tmp);