From 6097eb215266a825c9eedfab8f9c8482567ad4ab Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Tue, 28 Jun 2022 08:42:28 +0200 Subject: [PATCH] libcrypto and test: rename asn1_string_to_time_t to ossl_asn1_string_to_time_t Reviewed-by: Tomas Mraz Reviewed-by: Shane Lontis Reviewed-by: David von Oheimb (Merged from https://github.com/openssl/openssl/pull/18668) --- crypto/asn1/a_time.c | 2 +- include/crypto/asn1.h | 2 +- test/asn1_time_test.c | 4 ++-- test/ca_internals_test.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index a92cdaa89e4..23828b1e314 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -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; diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h index 2308cc0c03f..7636510c12d 100644 --- a/include/crypto/asn1.h +++ b/include/crypto/asn1.h @@ -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 */ diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c index 2383ec25c90..b222b44091a 100644 --- a/test/asn1_time_test.c +++ b/test/asn1_time_test.c @@ -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; } diff --git a/test/ca_internals_test.c b/test/ca_internals_test.c index 2928e5b0b32..24f7ba38843 100644 --- a/test/ca_internals_test.c +++ b/test/ca_internals_test.c @@ -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; } -- 2.47.3