Changeset b22170c

Timestamp:

Mar 1, 2010, 8:33:47 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.5

Children:

b381b55

Parents:

7d6a751

git-author:

Joshua Oreman <oremanj@MIT.EDU> (02/07/10 20:54:00)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/01/10 20:33:47)

Message:

Fix zcrypt when compiling without krb4

OpenSSL's "compatibility" DES API makes des_key_schedule a structure
containing an array, while in krb4 it was an array directly. Thus, we
need to pass a key schedule pointer to owl_zcrypt_string_to_schedule,
instead of passing the key schedule by value. The compatibility macros
defined in OpenSSL's des_old.h allow that function's passing of
*schedule to des_key_sched() to DTRT.

Reviewed-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

File:

• zcrypt.c (modified) (4 diffs)

zcrypt.c

@@ -63 +63 @@
 #define M_SETKEY          5
 
-static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule schedule) {
+static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
 #ifdef HAVE_KERBEROS_IV
   des_cblock key;
@@ -71 +71 @@
 
   des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+  des_key_sched(key, *schedule);
 }
 
@@ -103 +103 @@
   output[0] = '\0';    /* In case no message at all                 */
 
-  owl_zcrypt_string_to_schedule(keystring, schedule);
+  owl_zcrypt_string_to_schedule(keystring, &schedule);
 
   inptr=in;
@@ -142 +142 @@
   fclose(fkey);
 
-  owl_zcrypt_string_to_schedule(keystring, schedule);
+  owl_zcrypt_string_to_schedule(keystring, &schedule);
 
   inbuff=in;