* Add usage to verify in keyhash checks

* Include appropriate run flags for make check at top level

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 9992ad5214e1137a0855fd86fc3ed39199fe886a..820fef4c2202d7d18176df4ce05a6e68eb57c0a1 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-23  Sam Hartman  <hartmans@mit.edu>
 
+       * Makefile.in (RUN_SETUP): Include so make check works correctly
+
        * etypes.c: Add Heimdal aliases  arcfour-hmac-md5
 
        * cksumtypes.c: hmac-md5-rc4 keyed checksum added

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 0710d6f8085baf3f2db89722279b4f7bb12c582f..cb139e4a1ab65601cb83a441a41d8f3a11344545 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -7,6 +7,9 @@ LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
 LOCALINCLUDES = -I$(srcdir)/enc_provider \
        -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \
        -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk -I$(srcdir)/arcfour
+RUN_SETUP = @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=$(OUTPRE)crypto.lib

diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog
index c52095a6a1dd56b0f5c20aa133af8f808fc9dbba..d7986909563696af9387fb2324ac7396d53cfe85 100644 (file)
--- a/src/lib/crypto/keyhash_provider/ChangeLog
+++ b/src/lib/crypto/keyhash_provider/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-23  Sam Hartman  <hartmans@mit.edu>
 
+       * t_cksum.c (main): Include usage argument to verify
+
        * k5_md5des.c (k5_md5des_verify): Add usage
 
        * k5_md4des.c (k5_md4des_verify): Add usage

diff --git a/src/lib/crypto/keyhash_provider/t_cksum.c b/src/lib/crypto/keyhash_provider/t_cksum.c
index 21847c84f3aab0c6073176c77bafc3f9716aac6d..3fa022fd6fd97d30375622f0537b5d8c90f74ce5 100644 (file)
--- a/src/lib/crypto/keyhash_provider/t_cksum.c
+++ b/src/lib/crypto/keyhash_provider/t_cksum.c
@@ -108,7 +108,7 @@ main(argc, argv)
     }
     print_checksum("correct", MD, argv[msgindex], &newstyle_checksum);
 
-    if ((kret = (*(khp.verify))(&keyblock, 0, &plaintext, &newstyle_checksum,
+    if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum,
                                &valid))) {
       printf("verify on new checksum choked with %d\n", kret);
       break;
@@ -120,7 +120,7 @@ main(argc, argv)
     printf("Verify succeeded for \"%s\"\n", argv[msgindex]);
 
     newstyle_checksum.data[0]++;
-    if ((kret = (*(khp.verify))(&keyblock, 0, &plaintext, &newstyle_checksum,
+    if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum,
                                &valid))) {
       printf("verify on new checksum choked with %d\n", kret);
       break;