ruby-changes:11262
From: shyouhei <ko1@a...>
Date: Tue, 10 Mar 2009 16:08:47 +0900 (JST)
Subject: [ruby-changes:11262] Ruby:r22873 (ruby_1_8_6): merge revision(s) 16465:
shyouhei 2009-03-10 16:08:26 +0900 (Tue, 10 Mar 2009) New Revision: 22873 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22873 Log: merge revision(s) 16465: * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted prototype change in openssl bundled with newer OpenBSD. a patch from Takahiro Kambe <taca at back-street.net> in [ruby-dev:34691]. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/ext/openssl/openssl_missing.c branches/ruby_1_8_6/ext/openssl/openssl_missing.h branches/ruby_1_8_6/ext/openssl/ossl_hmac.c branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ext/openssl/ossl_hmac.c =================================================================== --- ruby_1_8_6/ext/openssl/ossl_hmac.c (revision 22872) +++ ruby_1_8_6/ext/openssl/ossl_hmac.c (revision 22873) @@ -81,9 +81,7 @@ GetHMAC(self, ctx1); SafeGetHMAC(other, ctx2); - if (!HMAC_CTX_copy(ctx1, ctx2)) { - ossl_raise(eHMACError, NULL); - } + HMAC_CTX_copy(ctx1, ctx2); return self; } @@ -104,9 +102,7 @@ { 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)); Index: ruby_1_8_6/ext/openssl/openssl_missing.c =================================================================== --- ruby_1_8_6/ext/openssl/openssl_missing.c (revision 22872) +++ ruby_1_8_6/ext/openssl/openssl_missing.c (revision 22873) @@ -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 */ Index: ruby_1_8_6/ext/openssl/openssl_missing.h =================================================================== --- ruby_1_8_6/ext/openssl/openssl_missing.h (revision 22872) +++ ruby_1_8_6/ext/openssl/openssl_missing.h (revision 22873) @@ -60,14 +60,33 @@ (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); @@ -111,19 +130,54 @@ #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) } Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22872) +++ ruby_1_8_6/ChangeLog (revision 22873) @@ -1,3 +1,10 @@ +Tue Mar 10 16:05:36 2009 Akinori MUSHA <knu@i...> + + * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted + prototype change in openssl bundled with newer OpenBSD. + a patch from Takahiro Kambe <taca at back-street.net> in + [ruby-dev:34691]. + Mon Mar 9 20:56:42 2009 Shugo Maeda <shugo@r...> * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22872) +++ ruby_1_8_6/version.h (revision 22873) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-03-09" +#define RUBY_RELEASE_DATE "2009-03-10" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090309 -#define RUBY_PATCHLEVEL 361 +#define RUBY_RELEASE_CODE 20090310 +#define RUBY_PATCHLEVEL 362 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 10 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/