We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.

2 files changed, 2 insertions, 117 deletions

diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c
index f3ea849f00..dec0093dd8 100644
--- a/src/lib/libc/crypt/bcrypt.c
+++ b/src/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $     */
+/*      $OpenBSD: bcrypt.c,v 1.16 2002/02/19 19:39:36 millert Exp $     */
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -97,16 +97,8 @@ const static u_int8_t index_64[128] =
 };
 #define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
 
-#ifdef __STDC__
 static void
 decode_base64(u_int8_t *buffer, u_int16_t len, u_int8_t *data)
-#else
-static void
-decode_base64(buffer, len, data)
-        u_int8_t *buffer;
-        u_int16_t len;
-        u_int8_t *data;
-#endif
 {
         u_int8_t *bp = buffer;
         u_int8_t *p = data;
@@ -140,17 +132,8 @@ decode_base64(buffer, len, data)
         }
 }
 
-#ifdef __STDC__
 static void
 encode_salt(char *salt, u_int8_t *csalt, u_int16_t clen, u_int8_t logr)
-#else
-static void
-encode_salt(salt, csalt, clen, logr)
-        char   *salt;
-        u_int8_t *csalt;
-        u_int16_t clen;
-        u_int8_t logr;
-#endif
 {
         salt[0] = '$';
         salt[1] = BCRYPT_VERSION;
@@ -166,14 +149,8 @@ encode_salt(salt, csalt, clen, logr)
    seems sensible.
  */
 
-#ifdef __STDC__
 char *
 bcrypt_gensalt(u_int8_t log_rounds)
-#else
-char *
-bcrypt_gensalt(log_rounds)
-        u_int8_t log_rounds;
-#endif
 {
         u_int8_t csalt[BCRYPT_MAXSALT];
         u_int16_t i;
@@ -296,16 +273,8 @@ bcrypt(key, salt)
         return encrypted;
 }
 
-#ifdef __STDC__
 static void
 encode_base64(u_int8_t *buffer, u_int8_t *data, u_int16_t len)
-#else
-static void
-encode_base64(buffer, data, len)
-        u_int8_t *buffer;
-        u_int8_t *data;
-        u_int16_t len;
-#endif
 {
         u_int8_t *bp = buffer;
         u_int8_t *p = data;
diff --git a/src/lib/libc/crypt/blowfish.c b/src/lib/libc/crypt/blowfish.c
index 695fc00a6a..8be04a6463 100644
--- a/src/lib/libc/crypt/blowfish.c
+++ b/src/lib/libc/crypt/blowfish.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: blowfish.c,v 1.15 2001/01/04 21:45:30 todd Exp $ */
+/* $OpenBSD: blowfish.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */
 /*
  * Blowfish block cipher for OpenBSD
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -402,16 +402,8 @@ Blowfish_initstate(c)
 
 }
 
-#ifdef __STDC__
 u_int32_t
 Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
-#else
-u_int32_t
-Blowfish_stream2word(data, databytes, current)
-        const u_int8_t *data;
-        u_int16_t databytes;
-        u_int16_t *current;
-#endif
 {
         u_int8_t i;
         u_int16_t j;
@@ -430,16 +422,8 @@ Blowfish_stream2word(data, databytes, current)
         return temp;
 }
 
-#if __STDC__
 void
 Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
-#else
-void
-Blowfish_expand0state(c, key, keybytes)
-        blf_ctx *c;
-        const u_int8_t *key;
-        u_int16_t keybytes;
-#endif
 {
         u_int16_t i;
         u_int16_t j;
@@ -476,19 +460,9 @@ Blowfish_expand0state(c, key, keybytes)
 }
 
 
-#if __STDC__
 void
 Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
                      const u_int8_t *key, u_int16_t keybytes)
-#else
-void
-Blowfish_expandstate(c, data, databytes, key, keybytes)
-        blf_ctx *c;
-        const u_int8_t *data;
-        u_int16_t databytes;
-        const u_int8_t *key;
-        u_int16_t keybytes;
-#endif
 {
         u_int16_t i;
         u_int16_t j;
@@ -529,16 +503,8 @@ Blowfish_expandstate(c, data, databytes, key, keybytes)
 
 }
 
-#if __STDC__
 void
 blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
-#else
-void
-blf_key(c, k, len)
-        blf_ctx *c;
-        const u_int8_t *k;
-        u_int16_t len;
-#endif
 {
         /* Initialize S-boxes and subkeys with Pi */
         Blowfish_initstate(c);
@@ -547,16 +513,8 @@ blf_key(c, k, len)
         Blowfish_expand0state(c, k, len);
 }
 
-#if __STDC__
 void
 blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-#else
-void
-blf_enc(c, data, blocks)
-        blf_ctx *c;
-        u_int32_t *data;
-        u_int16_t blocks;
-#endif
 {
         u_int32_t *d;
         u_int16_t i;
@@ -568,16 +526,8 @@ blf_enc(c, data, blocks)
         }
 }
 
-#if __STDC__
 void
 blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-#else
-void
-blf_dec(c, data, blocks)
-        blf_ctx *c;
-        u_int32_t *data;
-        u_int16_t blocks;
-#endif
 {
         u_int32_t *d;
         u_int16_t i;
@@ -589,16 +539,8 @@ blf_dec(c, data, blocks)
         }
 }
 
-#if __STDC__
 void
 blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-#else
-void
-blf_ecb_encrypt(c, data, len)
-     blf_ctx *c;
-     u_int8_t *data;
-     u_int32_t len;
-#endif
 {
         u_int32_t l, r;
         u_int32_t i;
@@ -619,16 +561,8 @@ blf_ecb_encrypt(c, data, len)
         }
 }
 
-#if __STDC__
 void
 blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-#else
-void
-blf_ecb_decrypt(c, data, len)
-     blf_ctx *c;
-     u_int8_t *data;
-     u_int32_t len;
-#endif
 {
         u_int32_t l, r;
         u_int32_t i;
@@ -649,17 +583,8 @@ blf_ecb_decrypt(c, data, len)
         }
 }
 
-#if __STDC__
 void
 blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
-#else
-void
-blf_cbc_encrypt(c, iv, data, len)
-     blf_ctx *c;
-     u_int8_t *iv;
-     u_int8_t *data;
-     u_int32_t len;
-#endif
 {
         u_int32_t l, r;
         u_int32_t i, j;
@@ -683,17 +608,8 @@ blf_cbc_encrypt(c, iv, data, len)
         }
 }
 
-#if __STDC__
 void
 blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
-#else
-void
-blf_cbc_decrypt(c, iva, data, len)
-     blf_ctx *c;
-     u_int8_t *iva;
-     u_int8_t *data;
-     u_int32_t len;
-#endif
 {
         u_int32_t l, r;
         u_int8_t *iv;