From: Adriaan de Jong <dejong@fox-it.com>
Date: Mon, 24 Oct 2011 11:11:32 +0000 (+0200)
Subject: Removed obsolete des_cblock and des_keyschedule
X-Git-Tag: v2.3-alpha1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=899e9e4c244410b1d26b84db992f137f8bcb5783;p=thirdparty%2Fopenvpn.git

Removed obsolete des_cblock and des_keyschedule

This is to allow building on NetBSD which does not install <des_old.h> anymore

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
---

diff --git a/crypto_openssl.c b/crypto_openssl.c
index e43d73c58..fdea326f4 100644
--- a/crypto_openssl.c
+++ b/crypto_openssl.c
@@ -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);
 }
 
 /*