diff options
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r-- | src/lib/libcrypto/asn1/a_time_tm.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn1_local.h | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/lib/libcrypto/asn1/a_time_tm.c b/src/lib/libcrypto/asn1/a_time_tm.c index ea94d2f59d..dc568d6636 100644 --- a/src/lib/libcrypto/asn1/a_time_tm.c +++ b/src/lib/libcrypto/asn1/a_time_tm.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_time_tm.c,v 1.31 2023/10/01 22:14:36 tb Exp $ */ | 1 | /* $OpenBSD: a_time_tm.c,v 1.32 2024/03/02 09:08:41 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -60,7 +60,6 @@ ASN1_time_tm_cmp(struct tm *tm1, struct tm *tm2) | |||
60 | return (1); | 60 | return (1); |
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | LCRYPTO_ALIAS(ASN1_time_tm_cmp); | ||
64 | 63 | ||
65 | int | 64 | int |
66 | ASN1_time_tm_clamp_notafter(struct tm *tm) | 65 | ASN1_time_tm_clamp_notafter(struct tm *tm) |
@@ -345,7 +344,6 @@ ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode) | |||
345 | 344 | ||
346 | return -1; | 345 | return -1; |
347 | } | 346 | } |
348 | LCRYPTO_ALIAS(ASN1_time_parse); | ||
349 | 347 | ||
350 | /* | 348 | /* |
351 | * ASN1_TIME generic functions. | 349 | * ASN1_TIME generic functions. |
@@ -417,7 +415,6 @@ ASN1_TIME_set_tm(ASN1_TIME *s, struct tm *tm) | |||
417 | return NULL; | 415 | return NULL; |
418 | return (ASN1_TIME_adj(s, t, 0, 0)); | 416 | return (ASN1_TIME_adj(s, t, 0, 0)); |
419 | } | 417 | } |
420 | LCRYPTO_ALIAS(ASN1_TIME_set_tm); | ||
421 | 418 | ||
422 | ASN1_TIME * | 419 | ASN1_TIME * |
423 | ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, long offset_sec) | 420 | ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, long offset_sec) |
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index c9099465db..63458db944 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/lib/libcrypto/asn1/asn1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1.h,v 1.90 2024/03/02 09:04:07 tb Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.91 2024/03/02 09:08:41 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -684,7 +684,6 @@ int ASN1_TIME_diff(int *pday, int *psec, const ASN1_TIME *from, | |||
684 | extern const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it; | 684 | extern const ASN1_ITEM ASN1_OCTET_STRING_NDEF_it; |
685 | 685 | ||
686 | ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t); | 686 | ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t); |
687 | ASN1_TIME *ASN1_TIME_set_tm(ASN1_TIME *s, struct tm *tm); | ||
688 | ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, | 687 | ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, |
689 | long offset_sec); | 688 | long offset_sec); |
690 | int ASN1_TIME_check(const ASN1_TIME *t); | 689 | int ASN1_TIME_check(const ASN1_TIME *t); |
@@ -1125,8 +1124,6 @@ void ERR_load_ASN1_strings(void); | |||
1125 | #define ASN1_R_WRONG_TAG 168 | 1124 | #define ASN1_R_WRONG_TAG 168 |
1126 | #define ASN1_R_WRONG_TYPE 169 | 1125 | #define ASN1_R_WRONG_TYPE 169 |
1127 | 1126 | ||
1128 | int ASN1_time_parse(const char *_bytes, size_t _len, struct tm *_tm, int _mode); | ||
1129 | int ASN1_time_tm_cmp(struct tm *_tm1, struct tm *_tm2); | ||
1130 | #ifdef __cplusplus | 1127 | #ifdef __cplusplus |
1131 | } | 1128 | } |
1132 | #endif | 1129 | #endif |
diff --git a/src/lib/libcrypto/asn1/asn1_local.h b/src/lib/libcrypto/asn1/asn1_local.h index a5478faa0b..e645dcb18e 100644 --- a/src/lib/libcrypto/asn1/asn1_local.h +++ b/src/lib/libcrypto/asn1/asn1_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1_local.h,v 1.8 2024/02/18 16:28:38 tb Exp $ */ | 1 | /* $OpenBSD: asn1_local.h,v 1.9 2024/03/02 09:08:41 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -187,4 +187,8 @@ void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it); | |||
187 | int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); | 187 | int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); |
188 | void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); | 188 | void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); |
189 | 189 | ||
190 | ASN1_TIME *ASN1_TIME_set_tm(ASN1_TIME *s, struct tm *tm); | ||
191 | int ASN1_time_parse(const char *_bytes, size_t _len, struct tm *_tm, int _mode); | ||
192 | int ASN1_time_tm_cmp(struct tm *_tm1, struct tm *_tm2); | ||
193 | |||
190 | __END_HIDDEN_DECLS | 194 | __END_HIDDEN_DECLS |