Merge branch 'pppoe-discovery-cleanup' of https://github.com/TDT-AG/ppp

[ppp.git] / pppd / pppcrypt.c

diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
index 8b85b13276ab30fd51a9ab7ad5352f605453acdb..6b35375edc5e4b1a02485c9630140b32b7de52b7 100644 (file)
--- a/pppd/pppcrypt.c
+++ b/pppd/pppcrypt.c
@@ -64,7 +64,7 @@ u_char *des_key;      /* OUT 64 bit DES key with parity bits added */
        des_key[7] = Get7Bits(key, 49);
 
 #ifndef USE_CRYPT
-       des_set_odd_parity((des_cblock *)des_key);
+       DES_set_odd_parity((DES_cblock *)des_key);
 #endif
 }
 
@@ -158,25 +158,25 @@ u_char *clear;    /* OUT 8 octets */
 }
 
 #else /* USE_CRYPT */
-static des_key_schedule        key_schedule;
+static DES_key_schedule        key_schedule;
 
 bool
 DesSetkey(key)
 u_char *key;
 {
-       des_cblock des_key;
+       DES_cblock des_key;
        MakeKey(key, des_key);
-       des_set_key(&des_key, key_schedule);
+       DES_set_key(&des_key, &key_schedule);
        return (1);
 }
 
 bool
-DesEncrypt(clear, key, cipher)
+DesEncrypt(clear, cipher)
 u_char *clear; /* IN  8 octets */
 u_char *cipher;        /* OUT 8 octets */
 {
-       des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
-           key_schedule, 1);
+       DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
+           &key_schedule, 1);
        return (1);
 }
 
@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
 u_char *cipher;        /* IN  8 octets */
 u_char *clear; /* OUT 8 octets */
 {
-       des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
-           key_schedule, 0);
+       DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
+           &key_schedule, 0);
        return (1);
 }