diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 04:12:32 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-12 04:12:32 +0000 |
commit | 3a20c9b8e41b32b0d83468abc4d17e4a98878fba (patch) | |
tree | 6db53a7b2ff95963c9910142ef03830ca6e08a94 | |
parent | 75fec1ca48a5430dcac9c1766f7ebb40e0328ad4 (diff) |
* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
externally defined modules; submitted by Technorama
Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704].
* ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto.
* ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto.
* ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto.
* ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto.
* ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto.
* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto.
* ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto.
* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto.
* ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto.
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 26 | ||||
-rw-r--r-- | ext/openssl/ossl_asn1.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_bn.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_cipher.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_digest.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_hmac.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 5 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_dsa.c | 5 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_rsa.c | 5 | ||||
-rw-r--r-- | ext/openssl/ossl_rand.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl.c | 4 |
12 files changed, 73 insertions, 0 deletions
@@ -1,3 +1,29 @@ +Mon Mar 12 11:07:44 2007 Akinori MUSHA <knu@iDaemons.org> + + * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about + externally defined modules; submitted by Technorama + Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704]. + + * ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto. + + * ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto. + + * ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto. + + * ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto. + + * ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto. + + * ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto. + + * ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto. + + * ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto. + + * ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto. + + * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto. + Mon Mar 12 01:23:50 2007 Akinori MUSHA <knu@iDaemons.org> * ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers. diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index ee3d8599ad..3614f470d9 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -1087,6 +1087,10 @@ Init_ossl_asn1() VALUE ary; int i; +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + sUNIVERSAL = rb_intern("UNIVERSAL"); sCONTEXT_SPECIFIC = rb_intern("CONTEXT_SPECIFIC"); sAPPLICATION = rb_intern("APPLICATION"); diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 47a607e60f..cc7689eef5 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -600,6 +600,10 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self) void Init_ossl_bn() { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + if (!(ossl_bn_ctx = BN_CTX_new())) { ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX"); } diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 67e7573ae4..57b7976617 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -380,6 +380,10 @@ CIPHER_0ARG_INT(block_size) void Init_ossl_cipher(void) { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + mCipher = rb_define_module_under(mOSSL, "Cipher"); eCipherError = rb_define_class_under(mOSSL, "CipherError", eOSSLError); cCipher = rb_define_class_under(mCipher, "Cipher", rb_cObject); diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c index d22f022442..4096b097a2 100644 --- a/ext/openssl/ossl_digest.c +++ b/ext/openssl/ossl_digest.c @@ -264,6 +264,10 @@ ossl_digest_size(VALUE self) void Init_ossl_digest() { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + mDigest = rb_define_module_under(mOSSL, "Digest"); eDigestError = rb_define_class_under(mDigest, "DigestError", eOSSLError); diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index ca5917518f..312343e03d 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -191,6 +191,10 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data) void Init_ossl_hmac() { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError); cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject); diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index db70333047..d54f5b938e 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -208,6 +208,10 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data) void Init_ossl_pkey() { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + mPKey = rb_define_module_under(mOSSL, "PKey"); ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError); diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 5b728ba353..e16ede8bba 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -418,6 +418,11 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen) void Init_ossl_dh() { +#if 0 /* let rdoc know about mOSSL and mPKey */ + mOSSL = rb_define_module("OpenSSL"); + mPKey = rb_define_module_under(mOSSL, "PKey"); +#endif + eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError); cDH = rb_define_class_under(mPKey, "DH", cPKey); rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1); diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c index 39b1902d57..fdf23aa496 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -378,6 +378,11 @@ OSSL_PKEY_BN(dsa, priv_key); void Init_ossl_dsa() { +#if 0 /* let rdoc know about mOSSL and mPKey */ + mOSSL = rb_define_module("OpenSSL"); + mPKey = rb_define_module_under(mOSSL, "PKey"); +#endif + eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError); cDSA = rb_define_class_under(mPKey, "DSA", cPKey); diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c index 17bec2b7bb..0afdcf8d01 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -459,6 +459,11 @@ OSSL_PKEY_BN(rsa, iqmp); void Init_ossl_rsa() { +#if 0 /* let rdoc know about mOSSL and mPKey */ + mOSSL = rb_define_module("OpenSSL"); + mPKey = rb_define_module_under(mOSSL, "PKey"); +#endif + eRSAError = rb_define_class_under(mPKey, "RSAError", ePKeyError); cRSA = rb_define_class_under(mPKey, "RSA", cPKey); diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c index ec9883d70a..71bb3bedd5 100644 --- a/ext/openssl/ossl_rand.c +++ b/ext/openssl/ossl_rand.c @@ -115,6 +115,10 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) void Init_ossl_rand() { +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + mRandom = rb_define_module_under(mOSSL, "Random"); eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError); diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 92384f1b1a..8e632b526b 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -855,6 +855,10 @@ Init_ossl_ssl() { int i; +#if 0 /* let rdoc know about mOSSL */ + mOSSL = rb_define_module("OpenSSL"); +#endif + ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0); ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0); ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0); |