Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------
2008-12-02  Tomas Mraz <t8m@centrum.cz>

        * modules/pam_timestamp/Makefile.am: Add hmacfile to tests.
        * modules/pam_timestamp/hmacfile.c: Do not try the short key
        testvector.

diff --git a/ChangeLog b/ChangeLog
index e0ba6a2310c64f1282b058443a17d0596b3abea4..7f12805ddda7c2b3d0cd4e410ad3275cab0461f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-02  Tomas Mraz <t8m@centrum.cz>
+
+       * modules/pam_timestamp/Makefile.am: Add hmacfile to tests.
+       * modules/pam_timestamp/hmacfile.c: Do not try the short key
+       testvector.
+
 2008-12-01  Tomas Mraz <t8m@centrum.cz>
 
        * modules/pam_unix/support.h: Fix masks for cipher algorithm

diff --git a/modules/pam_timestamp/.cvsignore b/modules/pam_timestamp/.cvsignore
index d9a7b0d94f6310b71d02c2b2aefac1c4cdadbadd..c084c9154287d85d6d5b23b4b8405fcf87d8c058 100644 (file)
--- 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 51a3c215b290c201c843f4ac5aa0058616424acc..373f483c78b2b2dd850af3bf19c19cd7ddd25d16 100644 (file)
--- a/modules/pam_timestamp/Makefile.am
+++ b/modules/pam_timestamp/Makefile.am
@@ -1,13 +1,13 @@
 #
 # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
-# 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 963f6f54a038c556b1e557247f041f38ba34a2b0..d2da5ff19c0da045e7a16dde340f73502ed64681 100644 (file)
--- 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,