Skip to contentSkip to conversation

Further removal of des_old.h based calls

PATCH In review Adriaan de Jong 2 participants 2 messages Oct 24, 2011 – Oct 25, 2011

lore
Share & tools
lore

Adriaan de Jong

author
#0 lore raw

PATCH 1/1 Further removal of des_old.h based calls

Replaced des_set_key_unchecked and des_ecb_encrypt functions in cipher_des_encrypt_ecb

Signed-off-by Adriaan de Jong <[email protected]...>
---
 crypto_openssl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
crypto_openssl.c +2 -2
index fdea326..9906479 100644
@@ -644,8 +644,8 @@ cipher_des_encrypt_ecb (const unsigned char key[DES_KEY_LENGTH],
 {
     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

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

crypto_openssl.c

Quoted 8 lines · Adriaan de Jong

Replaced des_set_key_unchecked and des_ecb_encrypt functions in cipher_des_encrypt_ecb

Signed-off-by Adriaan de Jong <[email protected]...> ---

crypto_openssl.c | 4 ++-- 1 files changed, 2 insertions(+), 2
deletions(-)

crypto_openssl.c +0 -0

ACKed by Gert on IRC. Applied and pushed. NetBSD builds seems to go fine again now.

commit 6e8b90ec0d0a074ac529541ce9515f25b30bac88

Author: Adriaan de Jong <[email protected]...>
Date:   Mon Oct 24 16:11:14 2011 +0200
    Signed-off-by: Adriaan de Jong <[email protected]...>
    Acked-by: Gert Doering <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

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

iEYEARECAAYFAk6mjOQACgkQDC186MBRfroJqACfX2RyHyKMB8P6nea69/v8PXY3 GM0An2Gpw/Zhqq4w59XSU5XMbQnlyT5+
=+ULv
-----END PGP SIGNATURE-----