From a8a1114efe98f44aa851078891663b1fccc1f9c1 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 15 May 2008 09:44:38 +0000 Subject: * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted to prototype change in openssl bundled with newer OpenBSD. a patch from Takahiro Kambe in [ruby-dev:34691]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++ ext/openssl/openssl_missing.c | 12 ++++------ ext/openssl/openssl_missing.h | 56 ++++++++++++++++++++++++++++++++++++++++++- ext/openssl/ossl_hmac.c | 8 ++----- 4 files changed, 69 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7e7055994..aeeac646d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,13 @@ Thu May 15 15:33:59 2008 Nobuyoshi Nakada * file.c (rb_file_s_extname): ditto. +Thu May 15 12:19:42 2008 Yukihiro Matsumoto + + * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted to + prototype change in openssl bundled with newer OpenBSD. + a patch from Takahiro Kambe in + [ruby-dev:34691]. + Wed May 14 22:09:25 2008 Yusuke Endoh * ChangeLog: fix typo. diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c index f77731ed65..724f36b8ae 100644 --- a/ext/openssl/openssl_missing.c +++ b/ext/openssl/openssl_missing.c @@ -22,17 +22,15 @@ #include "openssl_missing.h" #if !defined(HAVE_HMAC_CTX_COPY) -int +void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in) { - if (!out || !in) return 0; + if (!out || !in) return; memcpy(out, in, sizeof(HMAC_CTX)); - if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx) - || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx) - || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx)) - return 0; - return 1; + EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx); + EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx); + EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx); } #endif /* HAVE_HMAC_CTX_COPY */ #endif /* NO_HMAC */ diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index e8c75ca42c..3450b8130d 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -56,14 +56,33 @@ extern "C" { (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri) #endif +#if !defined(HAVE_EVP_MD_CTX_INIT) void HMAC_CTX_init(HMAC_CTX *ctx); -int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); +#endif + +#if !defined(HAVE_HMAC_CTX_COPY) +void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); +#endif + +#if !defined(HAVE_HMAC_CTX_CLEANUP) void HMAC_CTX_cleanup(HMAC_CTX *ctx); +#endif +#if !defined(HAVE_EVP_MD_CTX_CREATE) EVP_MD_CTX *EVP_MD_CTX_create(void); +#endif + +#if !defined(HAVE_EVP_MD_CTX_INIT) void EVP_MD_CTX_init(EVP_MD_CTX *ctx); +#endif + +#if !defined(HAVE_EVP_MD_CTX_CLEANUP) int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); +#endif + +#if !defined(HAVE_EVP_MD_CTX_DESTROY) void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); +#endif #if !defined(HAVE_EVP_CIPHER_CTX_COPY) int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in); @@ -107,19 +126,54 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in); #define OPENSSL_cleanse(p, l) memset(p, 0, l) #endif +#if !defined(HAVE_X509_STORE_SET_EX_DATA) void *X509_STORE_get_ex_data(X509_STORE *str, int idx); int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); +#endif + +#if !defined(HAVE_X509_CRL_SET_VERSION) int X509_CRL_set_version(X509_CRL *x, long version); +#endif + +#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME) int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name); +#endif + +#if !defined(HAVE_X509_CRL_SORT) int X509_CRL_sort(X509_CRL *c); +#endif + +#if !defined(HAVE_X509_CRL_ADD0_REVOKED) int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev); +#endif + +#if !defined(HAVE_BN_MOD_SQR) int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); +#endif + +#if !defined(HAVE_BN_MOD_ADD) int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); +#endif + +#if !defined(HAVE_BN_MOD_SUB) int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); +#endif + +#if !defined(HAVE_BN_RAND_RANGE) int BN_rand_range(BIGNUM *r, BIGNUM *range); +#endif + +#if !defined(HAVE_BN_PSEUDO_RAND_RANGE) int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range); +#endif + +#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE) char *CONF_get1_default_config_file(void); +#endif + +#if !defined(HAVE_PEM_DEF_CALLBACK) int PEM_def_callback(char *buf, int num, int w, void *key); +#endif #if defined(__cplusplus) } diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index ba85f521f7..ef77d6c427 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -87,9 +87,7 @@ ossl_hmac_copy(VALUE self, VALUE other) GetHMAC(self, ctx1); SafeGetHMAC(other, ctx2); - if (!HMAC_CTX_copy(ctx1, ctx2)) { - ossl_raise(eHMACError, NULL); - } + HMAC_CTX_copy(ctx1, ctx2); return self; } @@ -115,9 +113,7 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len) { HMAC_CTX final; - if (!HMAC_CTX_copy(&final, ctx)) { - ossl_raise(eHMACError, NULL); - } + HMAC_CTX_copy(&final, ctx); if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) { HMAC_CTX_cleanup(&final); OSSL_Debug("Allocating %d mem", HMAC_size(&final)); -- cgit v1.2.3