summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/asn1/a_time_tm.c3
-rw-r--r--src/lib/libcrypto/asn1/asn1.h8
-rw-r--r--src/lib/libcrypto/asn1/asn1_old.c3
-rw-r--r--src/lib/libcrypto/hidden/openssl/asn1.h4
4 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/libcrypto/asn1/a_time_tm.c b/src/lib/libcrypto/asn1/a_time_tm.c
index 16b9df2584..49d6ea2097 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.35 2024/04/09 13:56:00 tb Exp $ */ 1/* $OpenBSD: a_time_tm.c,v 1.36 2024/04/10 14:55:12 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -552,6 +552,7 @@ ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
552 return ASN1_TIME_cmp_time_t_internal(s, t, V_ASN1_UTCTIME); 552 return ASN1_TIME_cmp_time_t_internal(s, t, V_ASN1_UTCTIME);
553 return -2; 553 return -2;
554} 554}
555LCRYPTO_ALIAS(ASN1_UTCTIME_cmp_time_t);
555 556
556/* 557/*
557 * ASN1_GENERALIZEDTIME wrappers 558 * ASN1_GENERALIZEDTIME wrappers
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 63458db944..aeabbc0a28 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.91 2024/03/02 09:08:41 tb Exp $ */ 1/* $OpenBSD: asn1.h,v 1.92 2024/04/10 14:55:12 beck 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 *
@@ -573,9 +573,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
573 int offset_day, long offset_sec); 573 int offset_day, long offset_sec);
574int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str); 574int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
575 575
576#ifndef LIBRESSL_INTERNAL
577int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t); 576int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
578#endif /* !LIBRESSL_INTERNAL */
579 577
580int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a); 578int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);
581ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s, 579ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
@@ -736,12 +734,8 @@ int ASN1_object_size(int constructed, int length, int tag);
736 734
737void *ASN1_item_dup(const ASN1_ITEM *it, void *x); 735void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
738 736
739#ifndef LIBRESSL_INTERNAL
740
741void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x); 737void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
742 738
743#endif /* !LIBRESSL_INTERNAL */
744
745void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x); 739void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
746 740
747#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \ 741#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
diff --git a/src/lib/libcrypto/asn1/asn1_old.c b/src/lib/libcrypto/asn1/asn1_old.c
index a9aeeb823e..7992fccdef 100644
--- a/src/lib/libcrypto/asn1/asn1_old.c
+++ b/src/lib/libcrypto/asn1/asn1_old.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1_old.c,v 1.5 2023/07/07 19:37:52 beck Exp $ */ 1/* $OpenBSD: asn1_old.c,v 1.6 2024/04/10 14:55:12 beck 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 *
@@ -91,6 +91,7 @@ ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
91 free(b); 91 free(b);
92 return (ret); 92 return (ret);
93} 93}
94LCRYPTO_ALIAS(ASN1_dup);
94 95
95void * 96void *
96ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x) 97ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
diff --git a/src/lib/libcrypto/hidden/openssl/asn1.h b/src/lib/libcrypto/hidden/openssl/asn1.h
index 12d9618f80..91595d1da0 100644
--- a/src/lib/libcrypto/hidden/openssl/asn1.h
+++ b/src/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1.h,v 1.12 2024/03/02 09:08:41 tb Exp $ */ 1/* $OpenBSD: asn1.h,v 1.13 2024/04/10 14:55:12 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -231,5 +231,7 @@ LCRYPTO_USED(ASN1_item_print);
231LCRYPTO_USED(SMIME_crlf_copy); 231LCRYPTO_USED(SMIME_crlf_copy);
232LCRYPTO_USED(SMIME_text); 232LCRYPTO_USED(SMIME_text);
233LCRYPTO_USED(ERR_load_ASN1_strings); 233LCRYPTO_USED(ERR_load_ASN1_strings);
234LCRYPTO_UNUSED(ASN1_UTCTIME_cmp_time_t);
235LCRYPTO_UNUSED(ASN1_dup);
234 236
235#endif /* _LIBCRYPTO_ASN1_H */ 237#endif /* _LIBCRYPTO_ASN1_H */