From 024a7fd7a4f82dafefed7c467d691e57b7236046 Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 12 Mar 2007 02:01:19 +0000 Subject: * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about externally defined modules; submitted by Technorama Ltd. 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/trunk@12040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 26 ++++++++++++++++++++++++++ ext/openssl/ossl_asn1.c | 4 ++++ ext/openssl/ossl_bn.c | 4 ++++ ext/openssl/ossl_cipher.c | 4 ++++ ext/openssl/ossl_digest.c | 4 ++++ ext/openssl/ossl_hmac.c | 4 ++++ ext/openssl/ossl_pkey.c | 4 ++++ ext/openssl/ossl_pkey_dh.c | 5 +++++ ext/openssl/ossl_pkey_dsa.c | 5 +++++ ext/openssl/ossl_pkey_rsa.c | 5 +++++ ext/openssl/ossl_rand.c | 4 ++++ ext/openssl/ossl_ssl.c | 4 ++++ 12 files changed, 73 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6528716552..5ec95c473f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +Mon Mar 12 10:53:28 2007 Akinori MUSHA + + * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about + externally defined modules; submitted by Technorama + Ltd. 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. + Sun Mar 11 18:42:01 2007 Akinori MUSHA * misc/ruby-mode.el (ruby-block-end-re): Support for the diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 7ef822aa32..8ceea95021 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 0ddcb8270d..5a77ffe84e 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 e38aef8f7a..b50bee71c5 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -369,6 +369,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 09eadc9c9c..867fc47095 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 4ae04046e1..b06823a932 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 8858c65382..b85d1133fe 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -207,6 +207,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 c09508f70e..a9d708bd55 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -417,6 +417,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 76675df512..80cadb1cb6 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -377,6 +377,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 35f522f852..1102ea1b59 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -455,6 +455,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 a4247ec013..21af00f30b 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 e9fcbd3634..93bb709451 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -850,6 +850,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); -- cgit v1.2.3