Skip to contentSkip to conversation

Removed obsolete des_cblock and des_keyschedule

PATCH In review Adriaan de Jong 3 participants 3 messages Oct 24, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Removed obsolete des_cblock and des_keyschedule

To allow building on NetBSD.

---
 crypto_openssl.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
crypto_openssl.c +3 -3
index e43d73c..fdea326 100644
@@ -642,10 +642,10 @@ cipher_des_encrypt_ecb (const unsigned char key[DES_KEY_LENGTH],
     unsigned char *src,
     unsigned char *dst)
 {
-    des_key_schedule sched;
+    DES_key_schedule sched;
 
-    des_set_key_unchecked((des_cblock*)key, sched);
-    des_ecb_encrypt((des_cblock *)src, (des_cblock *)dst, sched, DES_ENCRYPT);
+    des_set_key_unchecked((DES_cblock*)key, sched);
+    des_ecb_encrypt((DES_cblock *)src, (DES_cblock *)dst, sched, DES_ENCRYPT);
 }
 
 /*
Signature · 1 line
1.7.5.4
#1 lore raw

Hi,

Quoted 3 lines · Adriaan de Jong

To allow building on NetBSD.

ACK, but maybe the comment should be a bit more descriptive, like

"allow building on NetBSD which does not install <des_old.h> anymore"

or such.

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#2 lore raw
In reply to Adriaan de Jong

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 3 lines · Adriaan de Jong

To allow building on NetBSD.

Applied to master branch on -testing and -stable git trees. Commit 899e9e4c244410b1d26b84db992f137f8bcb5783

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6lb84ACgkQDC186MBRfrpJjACgibrV+mZDECZVOQNvDqWqfDHK /OAAn1H91PyM1dyQk6dBWDA8i85gTWkP
=E4w5
-----END PGP SIGNATURE-----