mirror of
https://github.com/ruby/ruby.git
synced 2026-01-26 12:14:51 +00:00
[ruby/openssl] Remove dummy declarations for mOSSL and eOSSLError
These declarations were added to every source file because older
versions of RDoc did not resolve ancestor tree across files. Since
RDoc 6.9.0 supports this, this workaround is no longer needed.
https://redirect.github.com/ruby/rdoc/pull/1217
https://github.com/ruby/openssl/commit/6491ce63be
This commit is contained in:
parent
c8bfbd5700
commit
bae06ce22c
@ -1288,11 +1288,6 @@ Init_ossl_asn1(void)
|
||||
VALUE ary;
|
||||
int i;
|
||||
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
sym_UNIVERSAL = ID2SYM(rb_intern_const("UNIVERSAL"));
|
||||
sym_CONTEXT_SPECIFIC = ID2SYM(rb_intern_const("CONTEXT_SPECIFIC"));
|
||||
sym_APPLICATION = ID2SYM(rb_intern_const("APPLICATION"));
|
||||
|
||||
@ -1202,11 +1202,6 @@ ossl_bn_set_flags(VALUE self, VALUE arg)
|
||||
void
|
||||
Init_ossl_bn(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_RB_EXT_RACTOR_SAFE
|
||||
ossl_bn_ctx_key = rb_ractor_local_storage_ptr_newkey(&ossl_bn_ctx_key_type);
|
||||
#else
|
||||
|
||||
@ -901,11 +901,6 @@ ossl_cipher_set_ccm_data_len(VALUE self, VALUE data_len)
|
||||
void
|
||||
Init_ossl_cipher(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::Cipher
|
||||
*
|
||||
* Provides symmetric algorithms for encryption and decryption. The
|
||||
|
||||
@ -413,11 +413,6 @@ Init_ossl_config(void)
|
||||
char *path;
|
||||
VALUE path_str;
|
||||
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::Config
|
||||
*
|
||||
* Configuration for the openssl library.
|
||||
|
||||
@ -365,11 +365,6 @@ ossl_digest_block_length(VALUE self)
|
||||
void
|
||||
Init_ossl_digest(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::Digest
|
||||
*
|
||||
* OpenSSL::Digest allows you to compute message digests (sometimes
|
||||
|
||||
@ -466,11 +466,6 @@ ossl_engine_inspect(VALUE self)
|
||||
void
|
||||
Init_ossl_engine(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
|
||||
eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
|
||||
|
||||
|
||||
@ -256,11 +256,6 @@ ossl_hmac_reset(VALUE self)
|
||||
void
|
||||
Init_ossl_hmac(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Document-class: OpenSSL::HMAC
|
||||
*
|
||||
|
||||
@ -239,11 +239,6 @@ kdf_hkdf(int argc, VALUE *argv, VALUE self)
|
||||
void
|
||||
Init_ossl_kdf(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Document-module: OpenSSL::KDF
|
||||
*
|
||||
|
||||
@ -378,11 +378,6 @@ ossl_spki_verify(VALUE self, VALUE key)
|
||||
void
|
||||
Init_ossl_ns_spki(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
mNetscape = rb_define_module_under(mOSSL, "Netscape");
|
||||
|
||||
eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
|
||||
|
||||
@ -1626,11 +1626,6 @@ ossl_ocspcid_to_der(VALUE self)
|
||||
void
|
||||
Init_ossl_ocsp(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* OpenSSL::OCSP implements Online Certificate Status Protocol requests
|
||||
* and responses.
|
||||
|
||||
@ -300,11 +300,6 @@ void
|
||||
Init_ossl_pkcs12(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Defines a file format commonly used to store private keys with
|
||||
* accompanying public key certificates, protected with a password-based
|
||||
|
||||
@ -1099,11 +1099,6 @@ void
|
||||
Init_ossl_pkcs7(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
|
||||
ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);
|
||||
rb_define_singleton_method(cPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
|
||||
|
||||
@ -1658,11 +1658,6 @@ void
|
||||
Init_ossl_pkey(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
/* Document-module: OpenSSL::PKey
|
||||
*
|
||||
* == Asymmetric Public Key Algorithms
|
||||
|
||||
@ -357,12 +357,6 @@ OSSL_PKEY_BN_DEF2(dh, DH, key, pub_key, priv_key)
|
||||
void
|
||||
Init_ossl_dh(void)
|
||||
{
|
||||
#if 0
|
||||
mPKey = rb_define_module_under(mOSSL, "PKey");
|
||||
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
|
||||
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::PKey::DH
|
||||
*
|
||||
* An implementation of the Diffie-Hellman key exchange protocol based on
|
||||
|
||||
@ -334,12 +334,6 @@ OSSL_PKEY_BN_DEF2(dsa, DSA, key, pub_key, priv_key)
|
||||
void
|
||||
Init_ossl_dsa(void)
|
||||
{
|
||||
#if 0
|
||||
mPKey = rb_define_module_under(mOSSL, "PKey");
|
||||
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
|
||||
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::PKey::DSA
|
||||
*
|
||||
* DSA, the Digital Signature Algorithm, is specified in NIST's
|
||||
|
||||
@ -1526,13 +1526,6 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
|
||||
void Init_ossl_ec(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mPKey = rb_define_module_under(mOSSL, "PKey");
|
||||
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Document-class: OpenSSL::PKey::EC
|
||||
*
|
||||
|
||||
@ -536,12 +536,6 @@ OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, iqmp)
|
||||
void
|
||||
Init_ossl_rsa(void)
|
||||
{
|
||||
#if 0
|
||||
mPKey = rb_define_module_under(mOSSL, "PKey");
|
||||
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
|
||||
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
|
||||
#endif
|
||||
|
||||
/* Document-class: OpenSSL::PKey::RSA
|
||||
*
|
||||
* RSA is an asymmetric public key algorithm that has been formalized in
|
||||
|
||||
@ -185,11 +185,6 @@ ossl_provider_inspect(VALUE self)
|
||||
void
|
||||
Init_ossl_provider(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
cProvider = rb_define_class_under(mOSSL, "Provider", rb_cObject);
|
||||
eProviderError = rb_define_class_under(cProvider, "ProviderError", eOSSLError);
|
||||
|
||||
|
||||
@ -175,11 +175,6 @@ ossl_rand_status(VALUE self)
|
||||
void
|
||||
Init_ossl_rand(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
|
||||
mRandom = rb_define_module_under(mOSSL, "Random");
|
||||
|
||||
eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
|
||||
|
||||
@ -2704,8 +2704,6 @@ void
|
||||
Init_ossl_ssl(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
|
||||
rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
|
||||
#endif
|
||||
|
||||
@ -305,11 +305,6 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
|
||||
|
||||
void Init_ossl_ssl_session(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
mSSL = rb_define_module_under(mOSSL, "SSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SOCK
|
||||
cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
|
||||
eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
|
||||
|
||||
@ -1298,10 +1298,6 @@ end:
|
||||
void
|
||||
Init_ossl_ts(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Possible return value for +Response#failure_info+. Indicates that the
|
||||
* timestamp server rejects the message imprint algorithm used in the
|
||||
|
||||
@ -29,10 +29,6 @@ ossl_x509_time_adjust(ASN1_TIME *s, VALUE time)
|
||||
void
|
||||
Init_ossl_x509(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
#endif
|
||||
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
|
||||
Init_ossl_x509attr();
|
||||
|
||||
@ -288,12 +288,6 @@ ossl_x509attr_to_der(VALUE self)
|
||||
void
|
||||
Init_ossl_x509attr(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
|
||||
|
||||
cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
|
||||
|
||||
@ -886,12 +886,6 @@ ossl_x509_load(VALUE klass, VALUE buffer)
|
||||
void
|
||||
Init_ossl_x509cert(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
|
||||
|
||||
/* Document-class: OpenSSL::X509::Certificate
|
||||
|
||||
@ -506,12 +506,6 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
|
||||
void
|
||||
Init_ossl_x509crl(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
|
||||
|
||||
cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
|
||||
|
||||
@ -441,12 +441,6 @@ void
|
||||
Init_ossl_x509ext(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
|
||||
|
||||
cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
|
||||
|
||||
@ -496,12 +496,6 @@ Init_ossl_x509name(void)
|
||||
#undef rb_intern
|
||||
VALUE utf8str, ptrstr, ia5str, hash;
|
||||
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
id_aref = rb_intern("[]");
|
||||
eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
|
||||
cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
|
||||
|
||||
@ -414,12 +414,6 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
|
||||
void
|
||||
Init_ossl_x509req(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
|
||||
|
||||
cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
|
||||
|
||||
@ -267,12 +267,6 @@ ossl_x509revoked_to_der(VALUE self)
|
||||
void
|
||||
Init_ossl_x509revoked(void)
|
||||
{
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
|
||||
|
||||
cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
|
||||
|
||||
@ -859,12 +859,6 @@ void
|
||||
Init_ossl_x509store(void)
|
||||
{
|
||||
#undef rb_intern
|
||||
#if 0
|
||||
mOSSL = rb_define_module("OpenSSL");
|
||||
eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
|
||||
mX509 = rb_define_module_under(mOSSL, "X509");
|
||||
#endif
|
||||
|
||||
/* Register ext_data slot for verify callback Proc */
|
||||
stctx_ex_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"stctx_ex_verify_cb_idx", 0, 0, 0);
|
||||
if (stctx_ex_verify_cb_idx < 0)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user