From f9cde35ec82267c2fa3012276a35a6f1b2cf131f Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 2 Dec 2008 10:57:19 +0000 Subject: Relevant BUGIDs: Purpose of commit: cleanup Commit summary: --------------- 2008-12-02 Tomas Mraz * modules/pam_timestamp/Makefile.am: Add hmacfile to tests. * modules/pam_timestamp/hmacfile.c: Do not try the short key testvector. --- modules/pam_timestamp/.cvsignore | 3 ++- modules/pam_timestamp/Makefile.am | 4 ++-- modules/pam_timestamp/hmacfile.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/pam_timestamp/.cvsignore b/modules/pam_timestamp/.cvsignore index d9a7b0d9..c084c915 100644 --- a/modules/pam_timestamp/.cvsignore +++ b/modules/pam_timestamp/.cvsignore @@ -9,4 +9,5 @@ Makefile.in README pam_timestamp.8 pam_timestamp_check.8 - +hmacfile +pam_timestamp_check diff --git a/modules/pam_timestamp/Makefile.am b/modules/pam_timestamp/Makefile.am index 51a3c215..373f483c 100644 --- a/modules/pam_timestamp/Makefile.am +++ b/modules/pam_timestamp/Makefile.am @@ -1,13 +1,13 @@ # # Copyright (c) 2005 Thorsten Kukuk -# Copyright (c) 2005 Red Hat, Inc. +# Copyright (c) 2005, 2008 Red Hat, Inc. # CLEANFILES = *~ XMLS = README.xml pam_timestamp.8.xml pam_timestamp_check.8.xml man_MANS = pam_timestamp.8 pam_timestamp_check.8 -TESTS = tst-pam_timestamp +TESTS = tst-pam_timestamp hmacfile EXTRA_DIST = $(man_MANS) hmactest.c $(XMLS) $(TESTS) diff --git a/modules/pam_timestamp/hmacfile.c b/modules/pam_timestamp/hmacfile.c index 963f6f54..d2da5ff1 100644 --- a/modules/pam_timestamp/hmacfile.c +++ b/modules/pam_timestamp/hmacfile.c @@ -63,11 +63,13 @@ testvectors(void) "b617318655057264e28bc0b6fb378c8ef146be00", }, +#ifdef HMAC_ALLOW_SHORT_KEYS { "Jefe", 4, "what do ya want for nothing?", 28, "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79", }, +#endif { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", 20, -- cgit v1.2.3