openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

libcrypto and test: rename asn1_string_to_time_t to ossl_asn1_string_to_time_t 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/18668)
This commit is contained in:
Dr. David von Oheimb 2022-06-28 08:42:28 +02:00 committed by Dr. David von Oheimb
parent 7c310e872e
commit 6097eb2152
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/asn1/a_time.c
View File

@ -601,7 +601,7 @@ int ASN1_TIME_compare(const ASN1_TIME *a, const ASN1_TIME *b)
# define USE_TIMEGM
#endif
time_t asn1_string_to_time_t(const char *asn1_string)
time_t ossl_asn1_string_to_time_t(const char *asn1_string)
{
ASN1_TIME *timestamp_asn1 = NULL;
struct tm *timestamp_tm = NULL;

2
include/crypto/asn1.h
View File

@ -147,7 +147,7 @@ EVP_PKEY * ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a,
OSSL_LIB_CTX *libctx, const char *propq);
X509_ALGOR *ossl_X509_ALGOR_from_nid(int nid, int ptype, void *pval);
time_t asn1_string_to_time_t(const char *asn1_string);
time_t ossl_asn1_string_to_time_t(const char *asn1_string);
void ossl_asn1_string_set_bits_left(ASN1_STRING *str, unsigned int num);
#endif /* ndef OSSL_CRYPTO_ASN1_H */

4
test/asn1_time_test.c
View File

@ -431,10 +431,10 @@ static int convert_asn1_to_time_t(int idx)
{
time_t testdateutc;
testdateutc = asn1_string_to_time_t(asn1_to_utc[idx].input);
testdateutc = ossl_asn1_string_to_time_t(asn1_to_utc[idx].input);
if (!TEST_time_t_eq(testdateutc, asn1_to_utc[idx].expected)) {
TEST_info("asn1_string_to_time_t (%s) failed: expected %li, got %li\n",
TEST_info("ossl_asn1_string_to_time_t (%s) failed: expected %li, got %li\n",
asn1_to_utc[idx].input, asn1_to_utc[idx].expected, (signed long) testdateutc);
return 0;
}

2
test/ca_internals_test.c
View File

@ -47,7 +47,7 @@ static int test_do_updatedb(void)
}
testdate = test_get_argument(2);
testdateutc = asn1_string_to_time_t(testdate);
testdateutc = ossl_asn1_string_to_time_t(testdate);
if (TEST_time_t_lt(testdateutc, 0)) {
return 0;
}