summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-16 20:06:13 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-16 20:06:13 +0000
commit03c9ff29ce15c1fb47281d22fa10ef3624b26c78 (patch)
tree9351ff6c873f2848be366fa213e7d068bb2582e4
parentdea63e4ba22d354984ce0e9e4395f8aba7152ed3 (diff)
* backport r32987 from trunk.
* ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does *not* support #sign/verify. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/ossl_pkey.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 00b816a09b..807e05b593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Aug 17 05:02:25 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * backport r32987 from trunk.
+
+ * ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does
+ *not* support #sign/verify.
+
Tue Aug 16 18:56:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (ruby_threadptr_data_type): rename to hide.
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 43812daa9c..0600c9e29d 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -370,11 +370,11 @@ Init_ossl_pkey()
/* Document-class: OpenSSL::PKey::PKey
*
* An abstract class that bundles signature creation (PKey#sign) and
- * validation (PKey#verify) that is common to all implementations:
+ * validation (PKey#verify) that is common to all implementations except
+ * OpenSSL::PKey::DH
* * OpenSSL::PKey::RSA
* * OpenSSL::PKey::DSA
* * OpenSSL::PKey::EC
- * * OpenSSL::PKey::DH
*/
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);