svn rev #22858: branches/enc-perf/src/lib/crypto/crypto_tests/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22858
Commit By: ghudson
Log Message:
Adjust test programs to match new internal interfaces using krb5_key.



Changed Files:
U   branches/enc-perf/src/lib/crypto/crypto_tests/aes-test.c
U   branches/enc-perf/src/lib/crypto/crypto_tests/t_cksum.c
U   branches/enc-perf/src/lib/crypto/crypto_tests/t_hmac.c
Modified: branches/enc-perf/src/lib/crypto/crypto_tests/aes-test.c
===================================================================
--- branches/enc-perf/src/lib/crypto/crypto_tests/aes-test.c	2009-10-06 15:54:50 UTC (rev 22857)
+++ branches/enc-perf/src/lib/crypto/crypto_tests/aes-test.c	2009-10-06 16:11:31 UTC (rev 22858)
@@ -50,7 +50,11 @@
 }
 static void enc()
 {
-    krb5int_aes_encrypt(&enc_key, &ivec, &in, &out);
+    krb5_key key;
+
+    krb5_k_create_key(NULL, &enc_key, &key);
+    krb5int_aes_encrypt(key, &ivec, &in, &out);
+    krb5_k_free_key(NULL, key);
 }
 
 static void hexdump(const char *label, const char *cp, int len)

Modified: branches/enc-perf/src/lib/crypto/crypto_tests/t_cksum.c
===================================================================
--- branches/enc-perf/src/lib/crypto/crypto_tests/t_cksum.c	2009-10-06 15:54:50 UTC (rev 22857)
+++ branches/enc-perf/src/lib/crypto/crypto_tests/t_cksum.c	2009-10-06 16:11:31 UTC (rev 22858)
@@ -75,6 +75,7 @@
   krb5_boolean		valid;
   size_t		length;
   krb5_keyblock		keyblock;
+  krb5_key		key;
   krb5_error_code	kret=0;
   krb5_data		plaintext, newstyle_checksum;
 
@@ -89,6 +90,8 @@
   keyblock.length = sizeof(testkey);
   keyblock.contents = testkey;
 
+  krb5_k_create_key(NULL, &keyblock, &key);
+
   length = khp.hashsize;
 
   newstyle_checksum.length = length;
@@ -102,13 +105,13 @@
     plaintext.length = strlen(argv[msgindex]);
     plaintext.data = argv[msgindex];
 
-    if ((kret = (*(khp.hash))(&keyblock, 0, 0, &plaintext, &newstyle_checksum))) {
+    if ((kret = (*(khp.hash))(key, 0, 0, &plaintext, &newstyle_checksum))) {
       printf("krb5_calculate_checksum choked with %d\n", kret);
       break;
     }
     print_checksum("correct", MD, argv[msgindex], &newstyle_checksum);
 
-    if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum,
+    if ((kret = (*(khp.verify))(key, 0, 0, &plaintext, &newstyle_checksum,
 				&valid))) {
       printf("verify on new checksum choked with %d\n", kret);
       break;
@@ -120,7 +123,7 @@
     printf("Verify succeeded for \"%s\"\n", argv[msgindex]);
 
     newstyle_checksum.data[0]++;
-    if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum,
+    if ((kret = (*(khp.verify))(key, 0, 0, &plaintext, &newstyle_checksum,
 				&valid))) {
       printf("verify on new checksum choked with %d\n", kret);
       break;

Modified: branches/enc-perf/src/lib/crypto/crypto_tests/t_hmac.c
===================================================================
--- branches/enc-perf/src/lib/crypto/crypto_tests/t_hmac.c	2009-10-06 15:54:50 UTC (rev 22857)
+++ branches/enc-perf/src/lib/crypto/crypto_tests/t_hmac.c	2009-10-06 16:11:31 UTC (rev 22858)
@@ -98,6 +98,7 @@
     char tmp[40];
     size_t blocksize, hashsize;
     krb5_error_code err;
+    krb5_key k;
 
     printk(" test key", key);
     blocksize = h->blocksize;
@@ -120,7 +121,9 @@
 	printk(" pre-hashed key", key);
     }
     printd(" hmac input", in);
-    err = krb5_hmac(h, key, 1, in, out);
+    krb5_k_create_key(NULL, key, &k);
+    err = krb5_hmac(h, k, 1, in, out);
+    krb5_k_free_key(NULL, k);
     if (err == 0)
 	printd(" hmac output", out);
     return err;