diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-25 22:51:20 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-25 22:51:20 +0000 |
| commit | d9fcc9ba5e3a8f3eac6a2e06ba8477b0a648c492 (patch) | |
| tree | cf79ceda20e68efa4af18317cdf0a2ec8acebb56 /ext/openssl/ossl_pkey_dh.c | |
| parent | ab9cd02f256ac9206299b91062f6decef3f1cc69 (diff) | |
| download | ruby-d9fcc9ba5e3a8f3eac6a2e06ba8477b0a648c492.tar.gz | |
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move the default
tmp_dh_callback Ruby code and set it as a default in `initialize`.
* ext/openssl/ossl_pkey_dh.c (static unsigned char DEFAULT_DH_512_GEN):
move this constant to Ruby.
* ext/openssl/ossl_pkey_dh.c (static unsigned char DEFAULT_DH_1024_GEN):
ditto
* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): ditto
* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): tmp_dh_callback should
always be set, so we can remove this conditional
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_pkey_dh.c')
| -rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 234cdaa1c5..d622fc3c16 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -540,7 +540,6 @@ static unsigned char DEFAULT_DH_512_PRIM[] = { 0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb, }; static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 }; -DH *OSSL_DEFAULT_DH_512 = NULL; /* * -----BEGIN DH PARAMETERS----- @@ -568,7 +567,6 @@ static unsigned char DEFAULT_DH_1024_PRIM[] = { 0xff, 0x57, 0xe7, 0x19, 0x8d, 0x51, 0x77, 0x83 }; static unsigned char DEFAULT_DH_1024_GEN[] = { 0x02 }; -DH *OSSL_DEFAULT_DH_1024 = NULL; static DH* ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen) @@ -596,6 +594,8 @@ Init_ossl_dh(void) mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */ mPKey = rb_define_module_under(mOSSL, "PKey"); #endif + DH *OSSL_DEFAULT_DH_512; + DH *OSSL_DEFAULT_DH_1024; /* Document-class: OpenSSL::PKey::DHError * @@ -658,6 +658,9 @@ Init_ossl_dh(void) OSSL_DEFAULT_DH_1024 = ossl_create_dh( DEFAULT_DH_1024_PRIM, sizeof(DEFAULT_DH_1024_PRIM), DEFAULT_DH_1024_GEN, sizeof(DEFAULT_DH_1024_GEN)); + + rb_define_const(cDH, "DEFAULT_512", dh_instance(cDH, OSSL_DEFAULT_DH_512)); + rb_define_const(cDH, "DEFAULT_1024", dh_instance(cDH, OSSL_DEFAULT_DH_1024)); } #else /* defined NO_DH */ |