X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppcrypt.c;h=a954d62516b94569490814227307e2564c8b2cd1;hb=4a54e34cf5629f9fed61f0b7d69ee3ba4d874bc6;hp=8b85b13276ab30fd51a9ab7ad5352f605453acdb;hpb=f53a48eb9d74db3c71938e114b7f489c339bc003;p=ppp.git

diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
index 8b85b13..a954d62 100644
--- a/pppd/pppcrypt.c
+++ b/pppd/pppcrypt.c
@@ -30,14 +30,17 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
+
 #include "pppd.h"
 #include "pppcrypt.h"
 
 static u_char
-Get7Bits(input, startBit)
-u_char *input;
-int startBit;
+Get7Bits(u_char *input, int startBit)
 {
 	unsigned int word;
 
@@ -50,10 +53,10 @@ int startBit;
 }
 
 static void
-MakeKey(key, des_key)
-u_char *key;		/* IN  56 bit DES key missing parity bits */
-u_char *des_key;	/* OUT 64 bit DES key with parity bits added */
+MakeKey(u_char *key, u_char *des_key)
 {
+	/* key     IN  56 bit DES key missing parity bits */
+	/* des_key OUT 64 bit DES key with parity bits added */
 	des_key[0] = Get7Bits(key,  0);
 	des_key[1] = Get7Bits(key,  7);
 	des_key[2] = Get7Bits(key, 14);
@@ -64,7 +67,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
 }
 
@@ -75,9 +78,7 @@ u_char *des_key;	/* OUT 64 bit DES key with parity bits added */
  * Note that the low-order "bit" is always ignored by by setkey()
  */
 static void
-Expand(in, out)
-u_char *in;
-u_char *out;
+Expand(u_char *in, u_char *out)
 {
         int j, c;
         int i;
@@ -93,9 +94,7 @@ u_char *out;
 /* The inverse of Expand
  */
 static void
-Collapse(in, out)
-u_char *in;
-u_char *out;
+Collapse(u_char *in, u_char *out)
 {
         int j;
         int i;
@@ -110,8 +109,7 @@ u_char *out;
 }
 
 bool
-DesSetkey(key)
-u_char *key;
+DesSetkey(u_char *key)
 {
 	u_char des_key[8];
 	u_char crypt_key[66];
@@ -126,9 +124,7 @@ u_char *key;
 }
 
 bool
-DesEncrypt(clear, cipher)
-u_char *clear;	/* IN  8 octets */
-u_char *cipher;	/* OUT 8 octets */
+DesEncrypt(u_char *clear, u_char *cipher)
 {
 	u_char des_input[66];
 
@@ -142,9 +138,7 @@ u_char *cipher;	/* OUT 8 octets */
 }
 
 bool
-DesDecrypt(cipher, clear)
-u_char *cipher;	/* IN  8 octets */
-u_char *clear;	/* OUT 8 octets */
+DesDecrypt(u_char *cipher, u_char *clear)
 {
 	u_char des_input[66];
 
@@ -158,35 +152,30 @@ 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;
+DesSetkey(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)
-u_char *clear;	/* IN  8 octets */
-u_char *cipher;	/* OUT 8 octets */
+DesEncrypt(u_char *clear, u_char *cipher)
 {
-	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);
 }
 
 bool
-DesDecrypt(cipher, clear)
-u_char *cipher;	/* IN  8 octets */
-u_char *clear;	/* OUT 8 octets */
+DesDecrypt(u_char *cipher, u_char *clear)
 {
-	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);
 }