|
|
|
@ -310,7 +310,7 @@ xmlSecKeyPtr lasso_get_public_key_from_pem_file(const char *file) {
|
|
|
|
|
pub_key = lasso_get_public_key_from_pem_cert_file(file);
|
|
|
|
|
break;
|
|
|
|
|
case LASSO_PEM_FILE_TYPE_PUB_KEY:
|
|
|
|
|
+#if (XMLSEC_MAJOR > 1) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR > 2) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR == 2 && XMLSEC_SUBMINOR > 36)
|
|
|
|
|
#if LASSO_XMLSEC_VERSION_NUMBER > 0x010224
|
|
|
|
|
pub_key = xmlSecCryptoAppKeyLoadEx(file, xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate,
|
|
|
|
|
xmlSecKeyDataFormatPem, NULL, NULL, NULL);
|
|
|
|
|
#else
|
|
|
|
@ -384,11 +384,11 @@ lasso_get_public_key_from_pem_cert_file(const char *pem_cert_file)
|
|
|
|
|
static xmlSecKeyPtr
|
|
|
|
|
lasso_get_public_key_from_private_key_file(const char *private_key_file)
|
|
|
|
|
{
|
|
|
|
|
+#if (XMLSEC_MAJOR > 1) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR > 2) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR == 2 && XMLSEC_SUBMINOR > 36)
|
|
|
|
|
#if LASSO_XMLSEC_VERSION_NUMBER > 0x010224
|
|
|
|
|
return xmlSecCryptoAppKeyLoadEx(private_key_file, xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic,
|
|
|
|
|
xmlSecKeyDataFormatPem, NULL, NULL, NULL);
|
|
|
|
|
#else
|
|
|
|
|
return xmlSecCryptoAppKeyLoadEx(private_key_file,
|
|
|
|
|
return xmlSecCryptoAppKeyLoad(private_key_file,
|
|
|
|
|
xmlSecKeyDataFormatPem, NULL, NULL, NULL);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|