You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2006/01/17 11:07:52 UTC
svn commit: r369737 - /xml/security/trunk/c/src/tools/checksig/checksig.cpp
Author: blautenb
Date: Tue Jan 17 02:07:49 2006
New Revision: 369737
URL: http://svn.apache.org/viewcvs?rev=369737&view=rev
Log:
Simplify HMAC Key creation so as to work with NSS
Modified:
xml/security/trunk/c/src/tools/checksig/checksig.cpp
Modified: xml/security/trunk/c/src/tools/checksig/checksig.cpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/tools/checksig/checksig.cpp?rev=369737&r1=369736&r2=369737&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/checksig/checksig.cpp (original)
+++ xml/security/trunk/c/src/tools/checksig/checksig.cpp Tue Jan 17 02:07:49 2006
@@ -108,6 +108,13 @@
#endif
+#if defined (HAVE_NSS)
+
+# include <xsec/enc/NSS/NSSCryptoProvider.hpp>
+# include <xsec/enc/NSS/NSSCryptoKeyHMAC.hpp>
+
+#endif
+
#include <time.h>
#ifdef XSEC_NO_XALAN
@@ -478,15 +485,7 @@
// Load a key if necessary
if (hmacKeyStr != NULL) {
-#if defined (HAVE_OPENSSL)
- OpenSSLCryptoKeyHMAC * hmacKey;
- hmacKey = new OpenSSLCryptoKeyHMAC();
-#else
-# if defined (HAVE_WINCAPI)
- WinCAPICryptoKeyHMAC * hmacKey;
- hmacKey = new WinCAPICryptoKeyHMAC(0);
-# endif
-#endif
+ XSECCryptoKeyHMAC * hmacKey = XSECPlatformUtils::g_cryptoProvider->keyHMAC();
hmacKey->setKey((unsigned char *) hmacKeyStr, (unsigned int) strlen(hmacKeyStr));
sig->setSigningKey(hmacKey);