summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:39:54 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:39:54 +0000
commit2da14728063aa8adfb03fbfc0dfd2e7aef8f8bcb (patch)
tree51d4b3b6b0f7d56e200cada58734732aafd63438 /ext
parent345d52c8f57078afec56fd56703a19ce08cee1a6 (diff)
merge revision(s) 44584,44587,44945: [Backport #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 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
Diffstat (limited to 'ext')
-rw-r--r--ext/openssl/ossl_pkey_dh.c3
1 files changed, 1 insertions, 2 deletions
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 */
-