CVS commit: pkgsrc/www/cppcms

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Dec 21 13:39:21 UTC 2016

Modified Files:
        pkgsrc/www/cppcms: distinfo
Added Files:
        pkgsrc/www/cppcms/patches: patch-tests_encryptor__test.cpp

Log Message:
Resolve hmac fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/cppcms/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/cppcms/patches/patch-tests_encryptor__test.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/cppcms/distinfo
diff -u pkgsrc/www/cppcms/distinfo:1.4 pkgsrc/www/cppcms/distinfo:1.5
--- pkgsrc/www/cppcms/distinfo:1.4      Wed Nov  4 02:46:51 2015
+++ pkgsrc/www/cppcms/distinfo  Wed Dec 21 13:39:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 02:46:51 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/12/21 13:39:21 joerg Exp $
 
 SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276
 RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f
@@ -16,3 +16,4 @@ SHA1 (patch-cppcms_string__key.h) = 5532
 SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8
 SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add
 SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62
+SHA1 (patch-tests_encryptor__test.cpp) = c05549567c2b93572efa77be4891f9853db75377

Added files:

Index: pkgsrc/www/cppcms/patches/patch-tests_encryptor__test.cpp
diff -u /dev/null pkgsrc/www/cppcms/patches/patch-tests_encryptor__test.cpp:1.1
--- /dev/null   Wed Dec 21 13:39:21 2016
+++ pkgsrc/www/cppcms/patches/patch-tests_encryptor__test.cpp   Wed Dec 21 13:39:21 2016
@@ -0,0 +1,21 @@
+$NetBSD: patch-tests_encryptor__test.cpp,v 1.1 2016/12/21 13:39:21 joerg Exp $
+
+Resolve ambiguity with NetBSD's hmac function.
+
+--- tests/encryptor_test.cpp.orig      2016-12-21 00:15:55.815196132 +0000
++++ tests/encryptor_test.cpp
+@@ -131,12 +131,12 @@ void test_crypto()
+       }
+       std::cout << "-- testing hmac-sha1/md5" << std::endl;
+       {
+-              hmac d("md5",key("Jefe",4));
++              cppcms::crypto::hmac d("md5",key("Jefe",4));
+               TEST(get_diget(d,"what do ya want for nothing?") == "750c783e6ab0b503eaa86e310a5db738");
+       }
+       {
+               char const *bk = "xxxxxxxxxxxxxxddddddddddddddddddffffffffffffffffffffffffffffffffffffffffffffffdddddddddddddddddddd";
+-              hmac d(message_digest::md5(),key(bk,strlen(bk)));
++              cppcms::crypto::hmac d(message_digest::md5(),key(bk,strlen(bk)));
+               TEST(get_diget(d,"what do ya want for nothing?") == "4891f8cf6a4641897159756847369d1a");
+       }
+