[ruby/openssl] Call Init_ossl_*() functions in alphabetical order
It was originally sorted in alphabetical order, but it has been broken over time. Let's fix it. https://github.com/ruby/openssl/commit/974c67f38f
This commit is contained in:
parent
1df63d9451
commit
09d516b62e
@ -1150,24 +1150,22 @@ Init_openssl(void)
|
|||||||
/*
|
/*
|
||||||
* Init components
|
* Init components
|
||||||
*/
|
*/
|
||||||
|
Init_ossl_asn1();
|
||||||
Init_ossl_bn();
|
Init_ossl_bn();
|
||||||
Init_ossl_cipher();
|
Init_ossl_cipher();
|
||||||
Init_ossl_config();
|
Init_ossl_config();
|
||||||
Init_ossl_digest();
|
Init_ossl_digest();
|
||||||
|
Init_ossl_engine();
|
||||||
Init_ossl_hmac();
|
Init_ossl_hmac();
|
||||||
|
Init_ossl_kdf();
|
||||||
Init_ossl_ns_spki();
|
Init_ossl_ns_spki();
|
||||||
|
Init_ossl_ocsp();
|
||||||
Init_ossl_pkcs12();
|
Init_ossl_pkcs12();
|
||||||
Init_ossl_pkcs7();
|
Init_ossl_pkcs7();
|
||||||
Init_ossl_pkey();
|
Init_ossl_pkey();
|
||||||
|
Init_ossl_provider();
|
||||||
Init_ossl_rand();
|
Init_ossl_rand();
|
||||||
Init_ossl_ssl();
|
Init_ossl_ssl();
|
||||||
#ifndef OPENSSL_NO_TS
|
|
||||||
Init_ossl_ts();
|
Init_ossl_ts();
|
||||||
#endif
|
|
||||||
Init_ossl_x509();
|
Init_ossl_x509();
|
||||||
Init_ossl_ocsp();
|
|
||||||
Init_ossl_engine();
|
|
||||||
Init_ossl_provider();
|
|
||||||
Init_ossl_asn1();
|
|
||||||
Init_ossl_kdf();
|
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
#include <openssl/dsa.h>
|
#include <openssl/dsa.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/dh.h>
|
#include <openssl/dh.h>
|
||||||
|
#include "openssl_missing.h"
|
||||||
|
|
||||||
#ifndef LIBRESSL_VERSION_NUMBER
|
#ifndef LIBRESSL_VERSION_NUMBER
|
||||||
# define OSSL_IS_LIBRESSL 0
|
# define OSSL_IS_LIBRESSL 0
|
||||||
@ -178,28 +179,25 @@ extern VALUE dOSSL;
|
|||||||
/*
|
/*
|
||||||
* Include all parts
|
* Include all parts
|
||||||
*/
|
*/
|
||||||
#include "openssl_missing.h"
|
|
||||||
#include "ossl_asn1.h"
|
#include "ossl_asn1.h"
|
||||||
#include "ossl_bio.h"
|
#include "ossl_bio.h"
|
||||||
#include "ossl_bn.h"
|
#include "ossl_bn.h"
|
||||||
#include "ossl_cipher.h"
|
#include "ossl_cipher.h"
|
||||||
#include "ossl_config.h"
|
#include "ossl_config.h"
|
||||||
#include "ossl_digest.h"
|
#include "ossl_digest.h"
|
||||||
|
#include "ossl_engine.h"
|
||||||
#include "ossl_hmac.h"
|
#include "ossl_hmac.h"
|
||||||
|
#include "ossl_kdf.h"
|
||||||
#include "ossl_ns_spki.h"
|
#include "ossl_ns_spki.h"
|
||||||
#include "ossl_ocsp.h"
|
#include "ossl_ocsp.h"
|
||||||
#include "ossl_pkcs12.h"
|
#include "ossl_pkcs12.h"
|
||||||
#include "ossl_pkcs7.h"
|
#include "ossl_pkcs7.h"
|
||||||
#include "ossl_pkey.h"
|
#include "ossl_pkey.h"
|
||||||
|
#include "ossl_provider.h"
|
||||||
#include "ossl_rand.h"
|
#include "ossl_rand.h"
|
||||||
#include "ossl_ssl.h"
|
#include "ossl_ssl.h"
|
||||||
#ifndef OPENSSL_NO_TS
|
#include "ossl_ts.h"
|
||||||
#include "ossl_ts.h"
|
|
||||||
#endif
|
|
||||||
#include "ossl_x509.h"
|
#include "ossl_x509.h"
|
||||||
#include "ossl_engine.h"
|
|
||||||
#include "ossl_provider.h"
|
|
||||||
#include "ossl_kdf.h"
|
|
||||||
|
|
||||||
void Init_openssl(void);
|
void Init_openssl(void);
|
||||||
|
|
||||||
|
@ -1589,5 +1589,9 @@ Init_ossl_ts(void)
|
|||||||
rb_attr(cTimestampFactory, rb_intern_const("additional_certs"), 1, 1, 0);
|
rb_attr(cTimestampFactory, rb_intern_const("additional_certs"), 1, 1, 0);
|
||||||
rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3);
|
rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3);
|
||||||
}
|
}
|
||||||
|
#else /* OPENSSL_NO_TS */
|
||||||
|
void
|
||||||
|
Init_ossl_ts(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user