merge revision(s) 44584,44587,44945: [Backport ruby#9243]

nurse · nurse · commit cb38be4176ee · 2014-02-22T05:56:02.000Z
* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szﾃｼcs [Bug ruby#9243] * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?cs [Bug ruby#9243] * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug ruby#9243] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 22 14:52:55 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+
 Sat Feb 22 14:45: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
@@ -621,7 +621,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)
@@ -664,4 +664,3 @@ Init_ossl_dh()
 {
 }
 #endif /* NO_DH */
-
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ Init_ossl_dh()`
`621`	`621`	`*`
`622`	`622`	`* === Example of a key exchange`
`623`	`623`	`* dh1 = OpenSSL::PKey::DH.new(2048)`
`624`		`- * params = dh1.public_key.to_der #you may send this publicly to the participating party`
	`624`	`+ * der = dh1.public_key.to_der #you may send this publicly to the participating party`
`625`	`625`	`* dh2 = OpenSSL::PKey::DH.new(der)`
`626`	`626`	`* dh2.generate_key! #generate the per-session key pair`
`627`	`627`	`* symm_key1 = dh1.compute_key(dh2.pub_key)`
`@@ -664,4 +664,3 @@ Init_ossl_dh()`
`664`	`664`	`{`
`665`	`665`	`}`
`666`	`666`	`#endif /* NO_DH */`
`667`		`-`