aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-04-20 01:25:02 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-04-27 23:07:40 +0900
commit684ab990cd76643db37b29826fdaa3d52459a552 (patch)
treec1b0ffe0f74782e8f3efd2e2d7f691ee8d22efc6
parent26ddc91e4f0db749a2c33c67ac696340c796abcd (diff)
downloadruby-684ab990cd76643db37b29826fdaa3d52459a552.tar.gz
ext/openssl: drop support for OPENSSL_NO_HMAC
It has not been actually supported: since ossl.h includes openssl/hmac.h without any guards, it wouldn't compile if OPENSSL_NO_HMAC is enabled.
-rw-r--r--ext/openssl/openssl_missing.c6
-rw-r--r--ext/openssl/ossl_hmac.c11
2 files changed, 1 insertions, 16 deletions
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index df60c66..91797a8 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -13,14 +13,11 @@
#if !defined(OPENSSL_NO_ENGINE)
# include <openssl/engine.h>
#endif
-#if !defined(OPENSSL_NO_HMAC)
-# include <openssl/hmac.h>
-#endif
+#include <openssl/hmac.h>
#include <openssl/x509_vfy.h>
#include "openssl_missing.h"
-#if !defined(OPENSSL_NO_HMAC)
#if !defined(HAVE_HMAC_CTX_COPY)
void
HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
@@ -33,7 +30,6 @@ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
}
#endif /* HAVE_HMAC_CTX_COPY */
-#endif /* NO_HMAC */
#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
/*
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 5513cb2..7c114cf 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -7,8 +7,6 @@
* This program is licensed under the same licence as Ruby.
* (See the file 'LICENCE'.)
*/
-#if !defined(OPENSSL_NO_HMAC)
-
#include "ossl.h"
#define MakeHMAC(obj, klass, ctx) \
@@ -360,12 +358,3 @@ Init_ossl_hmac(void)
rb_define_alias(cHMAC, "inspect", "hexdigest");
rb_define_alias(cHMAC, "to_s", "hexdigest");
}
-
-#else /* NO_HMAC */
-# warning >>> OpenSSL is compiled without HMAC support <<<
-void
-Init_ossl_hmac(void)
-{
- rb_warning("HMAC is not available: OpenSSL is compiled without HMAC.");
-}
-#endif /* NO_HMAC */