summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-02-06 12:16:58 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-02-06 12:16:58 +0000
commita283d2a80adfaa88573bcd9acd3d8d7ab55c1af4 (patch)
tree319cd33b1def09641c6caf981564bdc3565b9f3e /crypto/pkcs12
parent3c33c6f6b10864355553961e638514a6d1bb00f6 (diff)
Remove OPENSSL_NO_HMAC
Disabling HMAC doesn't work. If it did it would end up disabling a lot of OpenSSL functionality (it is required for all versions of TLS for example). Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r--crypto/pkcs12/p12_mutl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index 256b210cce..4138a4d508 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -57,7 +57,6 @@
*
*/
-#ifndef OPENSSL_NO_HMAC
# include <stdio.h>
# include "cryptlib.h"
# include <openssl/hmac.h>
@@ -191,4 +190,3 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
return 1;
}
-#endif