Convert to ANSI C

[ppp.git] / pppd / pppcrypt.c

diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
index 6b35375edc5e4b1a02485c9630140b32b7de52b7..193f8fdf5528f78feba38dd41a5bc674ae0b01db 100644 (file)
--- a/pppd/pppcrypt.c
+++ b/pppd/pppcrypt.c
@@ -35,9 +35,7 @@
 #include "pppcrypt.h"
 
 static u_char
 #include "pppcrypt.h"
 
 static u_char

-Get7Bits(input, startBit)
-u_char *input;
-int startBit;
+Get7Bits(u_char *input, int startBit)

 {
        unsigned int word;
 
 {
        unsigned int word;
 


@@ -50,10 +48,10 @@ int startBit;
 }
 
 static void
 }
 
 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);
        des_key[0] = Get7Bits(key,  0);
        des_key[1] = Get7Bits(key,  7);
        des_key[2] = Get7Bits(key, 14);


@@ -75,9 +73,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
  * 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;
 {
         int j, c;
         int i;


@@ -93,9 +89,7 @@ u_char *out;
 /* The inverse of Expand
  */
 static void
 /* 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;
 {
         int j;
         int i;


@@ -110,8 +104,7 @@ u_char *out;
 }
 
 bool
 }
 
 bool

-DesSetkey(key)
-u_char *key;
+DesSetkey(u_char *key)

 {
        u_char des_key[8];
        u_char crypt_key[66];
 {
        u_char des_key[8];
        u_char crypt_key[66];


@@ -126,9 +119,7 @@ u_char *key;
 }
 
 bool
 }
 
 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];
 
 {
        u_char des_input[66];
 


@@ -142,9 +133,7 @@ u_char *cipher;     /* OUT 8 octets */
 }
 
 bool
 }
 
 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];
 
 {
        u_char des_input[66];
 


@@ -161,8 +150,7 @@ u_char *clear;      /* OUT 8 octets */
 static DES_key_schedule        key_schedule;
 
 bool
 static DES_key_schedule        key_schedule;
 
 bool

-DesSetkey(key)
-u_char *key;
+DesSetkey(u_char *key)

 {
        DES_cblock des_key;
        MakeKey(key, des_key);
 {
        DES_cblock des_key;
        MakeKey(key, des_key);


@@ -171,9 +159,7 @@ u_char *key;
 }
 
 bool
 }
 
 bool

-DesEncrypt(clear, 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);


@@ -181,9 +167,7 @@ u_char *cipher;     /* OUT 8 octets */
 }
 
 bool
 }
 
 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);