diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 15:52:34 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 15:52:34 +0000 |
commit | 9187fefa4dc96884a837023ef599f242fee82a0c (patch) | |
tree | 3c5a4f1793006cac8f4058a01154b46eb4aa49d1 | |
parent | cbc21bed71da5c4973d3faaf00eca43223d63772 (diff) |
merge revision(s) r44584,r44587,r44945: [Backport #9243]
* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Feb 16 00:50:59 2014 Zachary Scott <e@zzak.io> + + * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] + Sun Feb 16 00:47:36 2014 Zachary Scott <e@zzak.io> * lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index c8fb40e1ff..e0852c560d 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -619,7 +619,7 @@ Init_ossl_dh() * * === Example of a key exchange * dh1 = OpenSSL::PKey::DH.new(2048) - * params = dh1.public_key.to_der #you may send this publicly to the participating party + * der = dh1.public_key.to_der #you may send this publicly to the participating party * dh2 = OpenSSL::PKey::DH.new(der) * dh2.generate_key! #generate the per-session key pair * symm_key1 = dh1.compute_key(dh2.pub_key) @@ -662,4 +662,3 @@ Init_ossl_dh() { } #endif /* NO_DH */ - @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-16" -#define RUBY_PATCHLEVEL 416 +#define RUBY_PATCHLEVEL 417 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |