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

unak · unak · commit 2da14728063a · 2014-02-24T03:39:54.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_1_9_3@45157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 24 12:39:11 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+
 Mon Feb 24 12:33:38 2014  Zachary Scott  <e@zzak.io>
 
 	* 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ Init_ossl_dh()`
`572`	`572`	`*`
`573`	`573`	`* === Example of a key exchange`
`574`	`574`	`* dh1 = OpenSSL::PKey::DH.new(2048)`
`575`		`- * params = dh1.public_key.to_der #you may send this publicly to the participating party`
	`575`	`+ * der = dh1.public_key.to_der #you may send this publicly to the participating party`
`576`	`576`	`* dh2 = OpenSSL::PKey::DH.new(der)`
`577`	`577`	`* dh2.generate_key! #generate the per-session key pair`
`578`	`578`	`* symm_key1 = dh1.compute_key(dh2.pub_key)`
`@@ -615,4 +615,3 @@ Init_ossl_dh()`
`615`	`615`	`{`
`616`	`616`	`}`
`617`	`617`	`#endif /* NO_DH */`
`618`		`-`