naruse	2014-02-22 14:56:02 +0900 (Sat, 22 Feb 2014)

  New Revision: 45113

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45113

  Log:
    merge revision(s) 44584,44587,44945: [Backport #9243]
    
    * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?\239?\190?\131?\239?\189?\188cs [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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/openssl/ossl_pkey_dh.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45112)
+++ ruby_2_1/ChangeLog	(revision 45113)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 14:52:55 2014  Zachary Scott  <e@z...>
+
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+
 Sat Feb 22 14:45:36 2014  Zachary Scott  <e@z...>
 
 	* lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
Index: ruby_2_1/ext/openssl/ossl_pkey_dh.c
===================================================================
--- ruby_2_1/ext/openssl/ossl_pkey_dh.c	(revision 45112)
+++ ruby_2_1/ext/openssl/ossl_pkey_dh.c	(revision 45113)
@@ -621,7 +621,7 @@ Init_ossl_dh() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl_pkey_dh.c#L621
      *
      * === 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)
@@ -664,4 +664,3 @@ Init_ossl_dh() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/openssl/ossl_pkey_dh.c#L664
 {
 }
 #endif /* NO_DH */
-
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45112)
+++ ruby_2_1/version.h	(revision 45113)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 57
+#define RUBY_PATCHLEVEL 58
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44584,44587,44945


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/