Skip to content

Commit 09d516b

Browse files
rheniummatzbot
authored andcommitted
[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. ruby/openssl@974c67f38f
1 parent 1df63d9 commit 09d516b

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

ext/openssl/ossl.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,24 +1150,22 @@ Init_openssl(void)
11501150
/*
11511151
* Init components
11521152
*/
1153+
Init_ossl_asn1();
11531154
Init_ossl_bn();
11541155
Init_ossl_cipher();
11551156
Init_ossl_config();
11561157
Init_ossl_digest();
1158+
Init_ossl_engine();
11571159
Init_ossl_hmac();
1160+
Init_ossl_kdf();
11581161
Init_ossl_ns_spki();
1162+
Init_ossl_ocsp();
11591163
Init_ossl_pkcs12();
11601164
Init_ossl_pkcs7();
11611165
Init_ossl_pkey();
1166+
Init_ossl_provider();
11621167
Init_ossl_rand();
11631168
Init_ossl_ssl();
1164-
#ifndef OPENSSL_NO_TS
11651169
Init_ossl_ts();
1166-
#endif
11671170
Init_ossl_x509();
1168-
Init_ossl_ocsp();
1169-
Init_ossl_engine();
1170-
Init_ossl_provider();
1171-
Init_ossl_asn1();
1172-
Init_ossl_kdf();
11731171
}

ext/openssl/ossl.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include <openssl/dsa.h>
4646
#include <openssl/evp.h>
4747
#include <openssl/dh.h>
48+
#include "openssl_missing.h"
4849

4950
#ifndef LIBRESSL_VERSION_NUMBER
5051
# define OSSL_IS_LIBRESSL 0
@@ -178,28 +179,25 @@ extern VALUE dOSSL;
178179
/*
179180
* Include all parts
180181
*/
181-
#include "openssl_missing.h"
182182
#include "ossl_asn1.h"
183183
#include "ossl_bio.h"
184184
#include "ossl_bn.h"
185185
#include "ossl_cipher.h"
186186
#include "ossl_config.h"
187187
#include "ossl_digest.h"
188+
#include "ossl_engine.h"
188189
#include "ossl_hmac.h"
190+
#include "ossl_kdf.h"
189191
#include "ossl_ns_spki.h"
190192
#include "ossl_ocsp.h"
191193
#include "ossl_pkcs12.h"
192194
#include "ossl_pkcs7.h"
193195
#include "ossl_pkey.h"
196+
#include "ossl_provider.h"
194197
#include "ossl_rand.h"
195198
#include "ossl_ssl.h"
196-
#ifndef OPENSSL_NO_TS
197-
#include "ossl_ts.h"
198-
#endif
199+
#include "ossl_ts.h"
199200
#include "ossl_x509.h"
200-
#include "ossl_engine.h"
201-
#include "ossl_provider.h"
202-
#include "ossl_kdf.h"
203201

204202
void Init_openssl(void);
205203

ext/openssl/ossl_ts.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1589,5 +1589,9 @@ Init_ossl_ts(void)
15891589
rb_attr(cTimestampFactory, rb_intern_const("additional_certs"), 1, 1, 0);
15901590
rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3);
15911591
}
1592-
1592+
#else /* OPENSSL_NO_TS */
1593+
void
1594+
Init_ossl_ts(void)
1595+
{
1596+
}
15931597
#endif

0 commit comments

Comments
 (0)