Skip to content

Commit 974c67f

Browse files
committed
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.
1 parent 85d6b7f commit 974c67f

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
@@ -39,6 +39,7 @@
3939
#include <openssl/dsa.h>
4040
#include <openssl/evp.h>
4141
#include <openssl/dh.h>
42+
#include "openssl_missing.h"
4243

4344
#ifndef LIBRESSL_VERSION_NUMBER
4445
# define OSSL_IS_LIBRESSL 0
@@ -172,28 +173,25 @@ extern VALUE dOSSL;
172173
/*
173174
* Include all parts
174175
*/
175-
#include "openssl_missing.h"
176176
#include "ossl_asn1.h"
177177
#include "ossl_bio.h"
178178
#include "ossl_bn.h"
179179
#include "ossl_cipher.h"
180180
#include "ossl_config.h"
181181
#include "ossl_digest.h"
182+
#include "ossl_engine.h"
182183
#include "ossl_hmac.h"
184+
#include "ossl_kdf.h"
183185
#include "ossl_ns_spki.h"
184186
#include "ossl_ocsp.h"
185187
#include "ossl_pkcs12.h"
186188
#include "ossl_pkcs7.h"
187189
#include "ossl_pkey.h"
190+
#include "ossl_provider.h"
188191
#include "ossl_rand.h"
189192
#include "ossl_ssl.h"
190-
#ifndef OPENSSL_NO_TS
191-
#include "ossl_ts.h"
192-
#endif
193+
#include "ossl_ts.h"
193194
#include "ossl_x509.h"
194-
#include "ossl_engine.h"
195-
#include "ossl_provider.h"
196-
#include "ossl_kdf.h"
197195

198196
void Init_openssl(void);
199197

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)