public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typo and create compatibility macro

Browse source 
CLA:trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9472)
This commit is contained in:
Andreas Schnebinger 2019-10-12 18:48:40 +02:00 • committed by Dr. Matthias St. Pierre
parent c3885102f5
commit 1af26e53bc
6 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/ts.c
View file

@ -921,7 +921,7 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
/* Loading untrusted certificates. */ /* Loading untrusted certificates. */
if (untrusted if (untrusted
&& TS_VERIFY_CTS_set_certs(ctx, TS_CONF_load_certs(untrusted)) == NULL) && TS_VERIFY_CTX_set_certs(ctx, TS_CONF_load_certs(untrusted)) == NULL)
goto err; goto err;
ret = 1; ret = 1;

2
crypto/ts/ts_verify_ctx.c
View file

@ -60,7 +60,7 @@ X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s)
return ctx->store; return ctx->store;
} }
STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx,
STACK_OF(X509) *certs) STACK_OF(X509) *certs)
{ {
ctx->certs = certs; ctx->certs = certs;

5
include/openssl/ts.h
View file

@ -421,7 +421,10 @@ BIO *TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *b);
unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
unsigned char *hexstr, long len); unsigned char *hexstr, long len);
X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s); X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs); # if !OPENSSL_API_3
# define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx,cert)
# endif
STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
/*- /*-
* If ctx is NULL, it allocates and returns a new object, otherwise * If ctx is NULL, it allocates and returns a new object, otherwise

2
util/libcrypto.num
View file

@ -916,7 +916,7 @@ TS_TST_INFO_ext_free 938 3_0_0 EXIST::FUNCTION:TS
i2d_X509_CRL_fp 939 3_0_0 EXIST::FUNCTION:STDIO i2d_X509_CRL_fp 939 3_0_0 EXIST::FUNCTION:STDIO
PKCS7_get0_signers 940 3_0_0 EXIST::FUNCTION: PKCS7_get0_signers 940 3_0_0 EXIST::FUNCTION:
X509_STORE_CTX_set_ex_data 941 3_0_0 EXIST::FUNCTION: X509_STORE_CTX_set_ex_data 941 3_0_0 EXIST::FUNCTION:
TS_VERIFY_CTS_set_certs 942 3_0_0 EXIST::FUNCTION:TS TS_VERIFY_CTX_set_certs 942 3_0_0 EXIST::FUNCTION:TS
BN_MONT_CTX_copy 943 3_0_0 EXIST::FUNCTION: BN_MONT_CTX_copy 943 3_0_0 EXIST::FUNCTION:
OPENSSL_INIT_new 945 3_0_0 EXIST::FUNCTION: OPENSSL_INIT_new 945 3_0_0 EXIST::FUNCTION:
TS_ACCURACY_dup 946 3_0_0 EXIST::FUNCTION:TS TS_ACCURACY_dup 946 3_0_0 EXIST::FUNCTION:TS

2
util/missingcrypto.txt
View file

@ -1080,7 +1080,7 @@ TS_TST_INFO_set_serial
TS_TST_INFO_set_time TS_TST_INFO_set_time
TS_TST_INFO_set_tsa TS_TST_INFO_set_tsa
TS_TST_INFO_set_version TS_TST_INFO_set_version
TS_VERIFY_CTS_set_certs TS_VERIFY_CTX_set_certs
TS_VERIFY_CTX_add_flags TS_VERIFY_CTX_add_flags
TS_VERIFY_CTX_cleanup TS_VERIFY_CTX_cleanup
TS_VERIFY_CTX_free TS_VERIFY_CTX_free

1
util/missingmacro.txt
View file

@ -214,3 +214,4 @@ X509V3_set_ctx_test
X509V3_set_ctx_nodb X509V3_set_ctx_nodb
EXT_BITSTRING EXT_BITSTRING
EXT_IA5STRING EXT_IA5STRING
TS_VERIFY_CTS_set_certs