diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-12 17:15:29 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-12 17:15:29 +0000 |
commit | 0d23cc25c2bd3250c78e99bd39eb55827a89b28e (patch) | |
tree | 6cdfaaea93bb5ab2b1f476d10ba7783184a61f95 /ext/openssl | |
parent | 726624affd1a79b7768040ad70d1b928cdbd73ab (diff) | |
download | ruby-0d23cc25c2bd3250c78e99bd39eb55827a89b28e.tar.gz |
* ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
patch from IWATSUKI Hiroyuki. [ruby-dev:25867]
* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto.
(ossl_call_tmp_dh_callback): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 529ca0d57a..cdf131cc25 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -401,12 +401,12 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen) { DH *dh; - if ((dh = DH_new()) == NULL) ossl_irase(eDHError, NULL); + if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL); dh->p = BN_bin2bn(p, plen, NULL); dh->g = BN_bin2bn(g, glen, NULL); if (dh->p == NULL || dh->g == NULL){ DH_free(dh); - ossl_irase(eDHError, NULL); + ossl_raise(eDHError, NULL); } return dh; diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 1283c6d608..cd535d2b21 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -223,7 +223,7 @@ ossl_call_tmp_dh_callback(VALUE *args) dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]); pkey = GetPKeyPtr(dh); if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse; - ossl_ssl_set_tmp_dh_key(args[0], dh); + ossl_ssl_set_tmp_dh(args[0], dh); return Qtrue; } @@ -241,7 +241,7 @@ ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength) (VALUE)args, &status); if (status || !success) return NULL; - return GetPKeyPtr(ossl_ssl_get_dh(obj))->pkey.dh; + return GetPKeyPtr(ossl_ssl_get_tmp_dh(obj))->pkey.dh; } static DH* |