From 2da14728063aa8adfb03fbfc0dfd2e7aef8f8bcb Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 24 Feb 2014 03:39:54 +0000 Subject: [PATCH] merge revision(s) 44584,44587,44945: [Backport #9243] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szﾃｼcs [Bug #9243] * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?cs [Bug #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_1_9_3@45157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/openssl/ossl_pkey_dh.c | 3 +-- version.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1970d6cc8..5704d2a687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 24 12:39:11 2014 Zachary Scott + + * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] + Mon Feb 24 12:33:38 2014 Zachary Scott * lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 748d9c82fd..0a0c170c42 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -572,7 +572,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) @@ -615,4 +615,3 @@ Init_ossl_dh() { } #endif /* NO_DH */ - diff --git a/version.h b/version.h index e8247a726e..4b09f0b369 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 543 +#define RUBY_PATCHLEVEL 544 #define RUBY_RELEASE_DATE "2014-02-24" #define RUBY_RELEASE_YEAR 2014