diff options
| author | Sam Hartman <hartmans@mit.edu> | 2001-10-23 21:30:28 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2001-10-23 21:30:28 +0000 |
| commit | 733ae6a80ed99cb98d1bceed546725fb6ebe3dfc (patch) | |
| tree | df14534112e81d660b40802240941619f626caf0 | |
| parent | b6961143ecb93826fd24bbb7fbb27bfb82c3f6f7 (diff) | |
| download | krb5-733ae6a80ed99cb98d1bceed546725fb6ebe3dfc.tar.gz krb5-733ae6a80ed99cb98d1bceed546725fb6ebe3dfc.tar.xz krb5-733ae6a80ed99cb98d1bceed546725fb6ebe3dfc.zip | |
* 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
| -rw-r--r-- | src/lib/crypto/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/crypto/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/crypto/keyhash_provider/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/crypto/keyhash_provider/t_cksum.c | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 9992ad5214..820fef4c22 100644 --- 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 0710d6f808..cb139e4a1a 100644 --- 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 c52095a6a1..d798690956 100644 --- 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 21847c84f3..3fa022fd6f 100644 --- 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; |