Description
Santuario fails to build if NSS is present in the build environment. The configure script detects it, but the enabled conditional sources don't compile. I recommend the following patch:
diff --git a/xsec/enc/NSS/NSSCryptoSymmetricKey.cpp b/xsec/enc/NSS/NSSCryptoSymmetricKey.cpp index 0077ac0b..6f725091 100644 --- a/xsec/enc/NSS/NSSCryptoSymmetricKey.cpp +++ b/xsec/enc/NSS/NSSCryptoSymmetricKey.cpp @@ -255,7 +255,7 @@ int NSSCryptoSymmetricKey::decryptCtxInit(const unsigned char * iv) { m_ivSize = 16; } - else if (m_keyMode == MODE_ECB { + else if (m_keyMode == MODE_ECB) { SECItem * secParam = PK11_ParamFromIV(CKM_AES_ECB, NULL); mp_ctx = PK11_CreateContextBySymKey(CKM_AES_ECB, CKA_DECRYPT, mp_k, secParam); diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp index 48ea8028..b06bf4a5 100644 --- a/xsec/tools/xtest/xtest.cpp +++ b/xsec/tools/xtest/xtest.cpp @@ -2519,7 +2519,7 @@ int main(int argc, char **argv) { } #endif #if defined(XSEC_HAVE_NSS) - else if (stricmp(argv[paramCount], "--nss") == 0 || stricmp(argv[paramCount], "-n") == 0) { + else if (_stricmp(argv[paramCount], "--nss") == 0 || _stricmp(argv[paramCount], "-n") == 0) { g_useNSS = true; paramCount++; }