aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/crypto')
-rw-r--r--src/lib/crypto/crc32/ChangeLog4
-rw-r--r--src/lib/crypto/crc32/crc.c8
-rw-r--r--src/lib/crypto/dk/ChangeLog4
-rw-r--r--src/lib/crypto/dk/dk.h40
-rw-r--r--src/lib/crypto/md5/ChangeLog4
-rw-r--r--src/lib/crypto/md5/t_mddriver.c12
-rw-r--r--src/lib/crypto/old/ChangeLog4
-rw-r--r--src/lib/crypto/old/des_stringtokey.c4
-rw-r--r--src/lib/crypto/old/old.h16
-rw-r--r--src/lib/crypto/raw/ChangeLog4
-rw-r--r--src/lib/crypto/raw/raw.h12
11 files changed, 66 insertions, 46 deletions
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 5379f01..696218b 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * crc.c: Make prototypes unconditional.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* crc.c: Don't declare pointers FAR any more.
diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index 9cefe06..b0f7240 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -149,20 +149,20 @@ static u_long const crc_table[256] = {
/* Windows needs to these prototypes for crc32_cksumtable_entry below */
static krb5_error_code
-crc32_sum_func PROTOTYPE((
+crc32_sum_func (
const krb5_pointer in,
const size_t in_length,
const krb5_pointer seed,
const size_t seed_length,
- krb5_checksum *outcksum));
+ krb5_checksum *outcksum);
static krb5_error_code
-crc32_verify_func PROTOTYPE((
+crc32_verify_func (
const krb5_checksum *cksum,
const krb5_pointer in,
const size_t in_length,
const krb5_pointer seed,
- const size_t seed_length));
+ const size_t seed_length);
static krb5_error_code
crc32_sum_func(in, in_length, seed, seed_length, outcksum)
diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 63cbd02..a82f001 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * dk.h: Make prototypes unconditional.
+
2001-06-21 Ken Raeburn <raeburn@mit.edu>
* derive.c: Include etypes.h.
diff --git a/src/lib/crypto/dk/dk.h b/src/lib/crypto/dk/dk.h
index 57be71d..8d4c497 100644
--- a/src/lib/crypto/dk/dk.h
+++ b/src/lib/crypto/dk/dk.h
@@ -27,61 +27,61 @@
#include "k5-int.h"
void krb5_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
- size_t input, size_t *length));
+ size_t input, size_t *length);
krb5_error_code krb5_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec,
- const krb5_data *input, krb5_data *output));
+ const krb5_data *input, krb5_data *output);
krb5_error_code krb5_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *arg_output));
+ krb5_data *arg_output);
krb5_error_code krb5_dk_string_to_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const krb5_data *string, const krb5_data *salt,
- krb5_keyblock *key));
+ krb5_keyblock *key);
krb5_error_code krb5_derive_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const krb5_keyblock *inkey,
- krb5_keyblock *outkey, const krb5_data *in_constant));
+ krb5_keyblock *outkey, const krb5_data *in_constant);
krb5_error_code krb5_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
- const krb5_data *input, krb5_data *output));
+ const krb5_data *input, krb5_data *output);
#ifdef ATHENA_DES3_KLUDGE
void krb5_marc_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
- size_t input, size_t *length));
+ size_t input, size_t *length);
krb5_error_code krb5_marc_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec,
- const krb5_data *input, krb5_data *output));
+ const krb5_data *input, krb5_data *output);
krb5_error_code krb5_marc_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *arg_output));
+ krb5_data *arg_output);
krb5_error_code krb5_marc_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
- const krb5_data *input, krb5_data *output));
+ const krb5_data *input, krb5_data *output);
#endif /* ATHENA_DES3_KLUDGE */
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 47fe113..eaa3689 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * t_mddriver.c: Make prototypes unconditional.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* md5.c, rsa-md5.h: Don't explicitly declare pointers FAR any
diff --git a/src/lib/crypto/md5/t_mddriver.c b/src/lib/crypto/md5/t_mddriver.c
index 237c832..d894aaa 100644
--- a/src/lib/crypto/md5/t_mddriver.c
+++ b/src/lib/crypto/md5/t_mddriver.c
@@ -37,12 +37,12 @@ documentation and/or software.
#define TEST_BLOCK_LEN 1000
#define TEST_BLOCK_COUNT 1000
-static void MDString PROTOTYPE ((char *));
-static void MDTimeTrial PROTOTYPE ((void));
-static void MDTestSuite PROTOTYPE ((void));
-static void MDFile PROTOTYPE ((char *));
-static void MDFilter PROTOTYPE ((void));
-static void MDPrint PROTOTYPE ((unsigned char [16]));
+static void MDString (char *);
+static void MDTimeTrial (void);
+static void MDTestSuite (void);
+static void MDFile (char *);
+static void MDFilter (void);
+static void MDPrint (unsigned char [16]);
struct md_test_entry {
char *string;
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index 19067e3..af64760 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * des_stringtokey.c, old.h: Make prototypes unconditional.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* des_stringtokey.c: Don't explicitly declare pointers FAR any
diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c
index 55b0c0f..c27d77a 100644
--- a/src/lib/crypto/old/des_stringtokey.c
+++ b/src/lib/crypto/old/des_stringtokey.c
@@ -30,9 +30,9 @@
/* XXX */
extern krb5_error_code mit_des_string_to_key_int
-KRB5_PROTOTYPE ((krb5_keyblock * keyblock,
+(krb5_keyblock * keyblock,
const krb5_data * data,
- const krb5_data * salt));
+ const krb5_data * salt);
krb5_error_code
krb5_des_string_to_key(enc, string, salt, key)
diff --git a/src/lib/crypto/old/old.h b/src/lib/crypto/old/old.h
index a052325..b22b168 100644
--- a/src/lib/crypto/old/old.h
+++ b/src/lib/crypto/old/old.h
@@ -27,25 +27,25 @@
#include "k5-int.h"
void krb5_old_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
- size_t input, size_t *length));
+ size_t input, size_t *length);
krb5_error_code krb5_old_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *output));
+ krb5_data *output);
krb5_error_code krb5_old_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *arg_output));
+ krb5_data *arg_output);
krb5_error_code krb5_des_string_to_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const krb5_data *string, const krb5_data *salt,
- krb5_keyblock *key));
+ krb5_keyblock *key);
diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog
index bf10d3e..6d145e3 100644
--- a/src/lib/crypto/raw/ChangeLog
+++ b/src/lib/crypto/raw/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09 Ken Raeburn <raeburn@mit.edu>
+
+ * raw.h: Make prototypes unconditional.
+
2001-03-05 Ken Raeburn <raeburn@mit.edu>
* raw.h, raw_decrypt.c, raw_encrypt.c: Use const instead of
diff --git a/src/lib/crypto/raw/raw.h b/src/lib/crypto/raw/raw.h
index 79c235d..d3f7dd8 100644
--- a/src/lib/crypto/raw/raw.h
+++ b/src/lib/crypto/raw/raw.h
@@ -27,20 +27,20 @@
#include "k5-int.h"
void krb5_raw_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
- size_t input, size_t *length));
+ size_t input, size_t *length);
krb5_error_code krb5_raw_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *output));
+ krb5_data *output);
krb5_error_code krb5_raw_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
const struct krb5_hash_provider *hash,
const krb5_keyblock *key, krb5_keyusage usage,
const krb5_data *ivec, const krb5_data *input,
- krb5_data *arg_output));
+ krb5_data *arg_output);