Removed all references to DECLARG and OLDDECLARG

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4809 dc483132-0cff-0310-8789-dd5450dbe970

13 files changed, 78 insertions, 111 deletions

diff --git a/src/lib/crypto/des-crc.c b/src/lib/crypto/des-crc.c
index 26d7ca2c2..41258587c 100644
--- a/src/lib/crypto/des-crc.c
+++ b/src/lib/crypto/des-crc.c
@@ -63,16 +63,12 @@ krb5_cs_table_entry krb5_des_crc_cst_entry = {
 
 
 static krb5_error_code
-    mit_des_crc_encrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_des_crc_encrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
     krb5_checksum cksum;
     krb5_octet 	contents[CRC32_CKSUM_LENGTH];
@@ -132,16 +128,12 @@ OLDDECLARG(krb5_pointer, ivec)
 }
 
 static krb5_error_code
-    mit_des_crc_decrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_des_crc_decrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
     krb5_checksum cksum;
     krb5_octet 	contents_prd[CRC32_CKSUM_LENGTH];
diff --git a/src/lib/crypto/des-md5.c b/src/lib/crypto/des-md5.c
index ea9bd95a5..39adb1144 100644
--- a/src/lib/crypto/des-md5.c
+++ b/src/lib/crypto/des-md5.c
@@ -64,16 +64,12 @@ krb5_cs_table_entry krb5_des_md5_cst_entry = {
 
 
 static krb5_error_code
-    mit_des_md5_encrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_des_md5_encrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
     krb5_checksum cksum;
     krb5_octet 	contents[RSA_MD5_CKSUM_LENGTH];
@@ -133,16 +129,12 @@ OLDDECLARG(krb5_pointer, ivec)
 }
 
 static krb5_error_code
-    mit_des_md5_decrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_des_md5_decrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
     krb5_checksum cksum;
     krb5_octet 	contents_prd[RSA_MD5_CKSUM_LENGTH];
diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index 73254dac5..625326f0a 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -46,16 +46,12 @@
 
 	returns: errors
 */
-krb5_error_code mit_des_cbc_checksum(DECLARG(krb5_pointer, in),
-				     DECLARG(size_t, in_length),
-				     DECLARG(krb5_pointer, key),
-				     DECLARG(size_t, key_size),
-				     DECLARG(krb5_checksum *, cksum))
-OLDDECLARG(krb5_pointer, in)
-OLDDECLARG(size_t, in_length)
-OLDDECLARG(krb5_pointer, key)
-OLDDECLARG(size_t, key_size)
-OLDDECLARG(krb5_checksum *, cksum)
+krb5_error_code mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
+    krb5_pointer in;
+    size_t in_length;
+    krb5_pointer key;
+    size_t key_size;
+    krb5_checksum * cksum;
 {
     struct mit_des_ks_struct       *schedule;      /* pointer to key schedules */
     krb5_octet 	*contents;
diff --git a/src/lib/crypto/des/destest.c b/src/lib/crypto/des/destest.c
index c7fc3d884..71c2c6f8e 100644
--- a/src/lib/crypto/des/destest.c
+++ b/src/lib/crypto/des/destest.c
@@ -47,6 +47,7 @@ char *argv[];
 
     krb5_encrypt_block eblock;
     krb5_keyblock keyblock;
+    krb5_context context;
     mit_des_cblock key, input, output, output2;
     krb5_error_code retval;
     int num = 0;
@@ -56,7 +57,7 @@ char *argv[];
     /* do some initialisation */
     initialize_krb5_error_table();
 
-    krb5_use_cstype(&eblock, ETYPE_DES_CBC_CRC);
+    krb5_use_cstype(context, &eblock, ETYPE_DES_CBC_CRC);
     keyblock.magic = KV5M_KEYBLOCK;
     keyblock.etype = ETYPE_DES_CBC_CRC;
     keyblock.keytype = KEYTYPE_DES;
@@ -68,7 +69,7 @@ char *argv[];
 	convert(block2, input);
 	convert(block3, output);
 
-        if (retval = krb5_process_key(&eblock,&keyblock)) {
+        if (retval = krb5_process_key(context, &eblock,&keyblock)) {
             com_err("des test", retval, "can't process key");
             exit(-1);
         }
@@ -99,7 +100,7 @@ char *argv[];
 	    error++;
 	}
 
-        if (retval = krb5_finish_key(&eblock)) {
+        if (retval = krb5_finish_key(context, &eblock)) {
             com_err("des verify", retval, "can't finish key");
             exit(-1);
         }
diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c
index cbd562191..37905c160 100644
--- a/src/lib/crypto/des/fin_rndkey.c
+++ b/src/lib/crypto/des/fin_rndkey.c
@@ -32,8 +32,8 @@
         free any resources held by "seed" and assigned by init_random_key()
  */
 
-krb5_error_code mit_des_finish_random_key (DECLARG(krb5_pointer *, seed))
-OLDDECLARG(krb5_pointer *, seed)
+krb5_error_code mit_des_finish_random_key (seed)
+    krb5_pointer * seed;
 {
     memset((char *)*seed, 0, sizeof(mit_des_random_key_seed) );
     krb5_xfree(*seed);
diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c
index adbe18cc7..b70b679ea 100644
--- a/src/lib/crypto/des/finish_key.c
+++ b/src/lib/crypto/des/finish_key.c
@@ -36,8 +36,8 @@
 	returns: errors
  */
 
-krb5_error_code mit_des_finish_key (DECLARG(krb5_encrypt_block *,eblock))
-OLDDECLARG(krb5_encrypt_block *,eblock)
+krb5_error_code mit_des_finish_key (eblock)
+    krb5_encrypt_block * eblock;
 {
     memset((char *)eblock->priv, 0, sizeof(mit_des_key_schedule));
     free(eblock->priv);
diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index ae2708c59..954adf254 100644
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -37,10 +37,9 @@
         sequence information.
  */
 
-krb5_error_code mit_des_init_random_key (DECLARG(const krb5_keyblock *,seedblock),
-					 DECLARG(krb5_pointer *,seed))
-OLDDECLARG(const krb5_keyblock *,seedblock)
-OLDDECLARG(krb5_pointer *,seed)
+krb5_error_code mit_des_init_random_key (seedblock, seed)
+    const krb5_keyblock * seedblock;
+    krb5_pointer * seed;
 {
     mit_des_random_key_seed * p_seed;
     if (seedblock->keytype != KEYTYPE_DES)
diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c
index 4fc48c4ed..084c63fc8 100644
--- a/src/lib/crypto/des/new_rn_key.c
+++ b/src/lib/crypto/des/new_rn_key.c
@@ -90,6 +90,7 @@ void mit_des_init_random_number_generator(key,p_seed)
     mit_des_cblock new_key;
 
     krb5_address **addrs = 0;
+    krb5_context context;
 
     /*
      * use a host id in generating the seed to ensure
@@ -128,7 +129,7 @@ void mit_des_init_random_number_generator(key,p_seed)
      * use a time stamp to ensure that a server started later does not reuse
      * an old stream:
      */
-    (void) krb5_us_timeofday(&timenow.seconds,
+    (void) krb5_us_timeofday(context, &timenow.seconds,
 			     &timenow.microseconds); /* XXX return value */
     mit_des_set_sequence_number((unsigned char *)&timenow, p_seed);
 
diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c
index 78d224e7b..a2214f63d 100644
--- a/src/lib/crypto/des/process_ky.c
+++ b/src/lib/crypto/des/process_ky.c
@@ -44,10 +44,9 @@
         returns: errors
  */
 
-krb5_error_code mit_des_process_key (DECLARG(krb5_encrypt_block *, eblock),
-				     DECLARG(const krb5_keyblock *,keyblock))
-OLDDECLARG(krb5_encrypt_block *, eblock)
-OLDDECLARG(const krb5_keyblock *,keyblock)
+krb5_error_code mit_des_process_key (eblock, keyblock)
+    krb5_encrypt_block * eblock;
+    const krb5_keyblock * keyblock;
 {
     struct mit_des_ks_struct       *schedule;      /* pointer to key schedules */
     
diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c
index 184d1099e..009e26db4 100644
--- a/src/lib/crypto/des/random_key.c
+++ b/src/lib/crypto/des/random_key.c
@@ -33,12 +33,10 @@
         filling in the keyblock address in *keyblock
  */
 
-krb5_error_code mit_des_random_key (DECLARG(const krb5_encrypt_block *, eblock),
-				    DECLARG(krb5_pointer, seed),
-				    DECLARG(krb5_keyblock **, keyblock))
-OLDDECLARG(const krb5_encrypt_block *, eblock)
-OLDDECLARG(krb5_pointer, seed)
-OLDDECLARG(krb5_keyblock **, keyblock)
+krb5_error_code mit_des_random_key (eblock, seed, keyblock)
+    const krb5_encrypt_block * eblock;
+    krb5_pointer seed;
+    krb5_keyblock ** keyblock;
 {
     krb5_keyblock *randkey;
 
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index be3292beb..d4d8b8849 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -44,16 +44,12 @@
 	returns: errors
  */
 
-krb5_error_code mit_des_string_to_key (DECLARG(const krb5_encrypt_block *, eblock),
-				       DECLARG(const krb5_keytype, keytype),
-				       DECLARG(krb5_keyblock *,keyblock),
-				       DECLARG(const krb5_data *,data),
-				       DECLARG(const krb5_data *, salt))
-OLDDECLARG(const krb5_encrypt_block *, eblock)
-OLDDECLARG(const krb5_keytype, keytype)
-OLDDECLARG(krb5_keyblock *,keyblock)
-OLDDECLARG(const krb5_data *,data)
-OLDDECLARG(const krb5_data *, salt)
+krb5_error_code mit_des_string_to_key (eblock, keytype, keyblock, data, salt)
+const krb5_encrypt_block * eblock;
+const krb5_keytype keytype;
+krb5_keyblock * keyblock;
+const krb5_data * data;
+const krb5_data * salt;
 {
     register char *str, *copystr;
     register krb5_octet *key;
diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/verify.c
index 387e2c7cb..0d70bd708 100644
--- a/src/lib/crypto/des/verify.c
+++ b/src/lib/crypto/des/verify.c
@@ -109,6 +109,7 @@ main(argc,argv)
     char *argv[];
 {
     /* Local Declarations */
+    krb5_context context;
     int	 in_length;
     void do_encrypt();
     void do_decrypt();
@@ -147,7 +148,7 @@ main(argc,argv)
     /* do some initialisation */
     initialize_krb5_error_table(); 
 
-    krb5_use_cstype(&eblock, ETYPE_DES_CBC_CRC);
+    krb5_use_cstype(context, &eblock, ETYPE_DES_CBC_CRC);
     keyblock.keytype = KEYTYPE_DES;
     keyblock.length = sizeof (mit_des_cblock);
 
@@ -157,7 +158,7 @@ main(argc,argv)
     if (zflag) {
 	input = zero_text;
 	keyblock.contents = (krb5_octet *)zero_key;
-	if (retval = krb5_process_key(&eblock,&keyblock)) {
+	if (retval = krb5_process_key(context, &eblock,&keyblock)) {
 	    com_err("des verify", retval, "can't process zero key");
 	    exit(-1);
 	}
@@ -168,7 +169,7 @@ main(argc,argv)
 	    printf("%02x ",cipher_text[j]);
 	printf("\n");
 	do_decrypt(output,cipher_text);
-	if (retval = krb5_finish_key(&eblock)) {
+	if (retval = krb5_finish_key(context, &eblock)) {
 	    com_err("des verify", retval, "can't finish zero key");
 	    exit(-1);
 	}
@@ -182,7 +183,7 @@ main(argc,argv)
     if (mflag) {
 	input = msb_text;
 	keyblock.contents = (krb5_octet *)key3;
-	if (retval = krb5_process_key(&eblock,&keyblock)) {
+	if (retval = krb5_process_key(context, &eblock,&keyblock)) {
 	    com_err("des verify", retval, "can't process key3");
 	    exit(-1);
 	}
@@ -196,7 +197,7 @@ main(argc,argv)
 	}
 	printf("\n");
 	do_decrypt(output,cipher_text);
-	if (retval = krb5_finish_key(&eblock)) {
+	if (retval = krb5_finish_key(context, &eblock)) {
 	    com_err("des verify", retval, "can't finish key3");
 	    exit(-1);
 	}
@@ -211,7 +212,7 @@ main(argc,argv)
     {
 	input = zero_text;
 	keyblock.contents = (krb5_octet *)key2;
-	if (retval = krb5_process_key(&eblock,&keyblock)) {
+	if (retval = krb5_process_key(context, &eblock,&keyblock)) {
 	    com_err("des verify", retval, "can't process key2");
 	    exit(-1);
 	}
@@ -230,7 +231,7 @@ main(argc,argv)
 	    printf("%02x ",cipher_text[j]);
 	printf("\n\n");
 	do_decrypt(output,cipher_text);
-	if (retval = krb5_finish_key(&eblock)) {
+	if (retval = krb5_finish_key(context, &eblock)) {
 	    com_err("des verify", retval, "can't finish key2");
 	    exit(-1);
 	}
@@ -245,7 +246,7 @@ main(argc,argv)
     /* ECB mode */
     {
 	keyblock.contents = (krb5_octet *)default_key;
-	if (retval = krb5_process_key(&eblock,&keyblock)) {
+	if (retval = krb5_process_key(context, &eblock,&keyblock)) {
 	    com_err("des verify", retval, "can't process key2");
 	    exit(-1);
 	}
@@ -328,7 +329,7 @@ main(argc,argv)
     for (j = 0; j<=7; j++)
 	printf("%02x ",cipher_text[j]);
     printf("\n\n");
-    if (retval = krb5_finish_key(&eblock)) {
+    if (retval = krb5_finish_key(context, &eblock)) {
 	com_err("des verify", retval, "can't finish key2");
 	exit(-1);
     }
diff --git a/src/lib/crypto/raw-des.c b/src/lib/crypto/raw-des.c
index bb0a7a4dc..254c86223 100644
--- a/src/lib/crypto/raw-des.c
+++ b/src/lib/crypto/raw-des.c
@@ -61,16 +61,12 @@ krb5_cs_table_entry krb5_raw_des_cst_entry = {
     };
 
 static krb5_error_code
-    mit_raw_des_decrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_raw_des_decrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
     return (mit_des_cbc_encrypt (in, 
 				 out, 
@@ -81,16 +77,12 @@ OLDDECLARG(krb5_pointer, ivec)
 }
 
 static krb5_error_code
-    mit_raw_des_encrypt_func(DECLARG(krb5_const_pointer, in),
-			     DECLARG(krb5_pointer, out),
-			     DECLARG(const size_t, size),
-			     DECLARG(krb5_encrypt_block *, key),
-			     DECLARG(krb5_pointer, ivec))
-OLDDECLARG(krb5_const_pointer, in)
-OLDDECLARG(krb5_pointer, out)
-OLDDECLARG(const size_t, size)
-OLDDECLARG(krb5_encrypt_block *, key)
-OLDDECLARG(krb5_pointer, ivec)
+mit_raw_des_encrypt_func(in, out, size, key, ivec)
+    krb5_const_pointer in;
+    krb5_pointer out;
+    const size_t size;
+    krb5_encrypt_block * key;
+    krb5_pointer ivec;
 {
    int sumsize;