6 files changed, 9 insertions, 157 deletions

diff --git a/src/lib/libcrypto/man/ASN1_STRING_new.3 b/src/lib/libcrypto/man/ASN1_STRING_new.3
index 9500b82df3..19b0ca1161 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_new.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ASN1_STRING_new.3,v 1.25 2023/07/28 05:48:33 tb Exp $
+.\"     $OpenBSD: ASN1_STRING_new.3,v 1.26 2024/03/05 18:30:40 tb Exp $
 .\"     OpenSSL 99d63d46 Tue Mar 24 07:52:24 2015 -0400
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 28 2023 $
+.Dd $Mdocdate: March 5 2024 $
 .Dt ASN1_STRING_NEW 3
 .Os
 .Sh NAME
@@ -212,7 +212,6 @@ is returned and an error code can be retrieved with
 .Xr ASN1_PRINTABLE_type 3 ,
 .Xr ASN1_STRING_length 3 ,
 .Xr ASN1_STRING_print_ex 3 ,
-.Xr ASN1_time_parse 3 ,
 .Xr ASN1_TIME_set 3 ,
 .Xr ASN1_TYPE_get 3 ,
 .Xr ASN1_UNIVERSALSTRING_to_string 3 ,
diff --git a/src/lib/libcrypto/man/ASN1_TIME_set.3 b/src/lib/libcrypto/man/ASN1_TIME_set.3
index b5ed51567b..233cb13f2c 100644
--- a/src/lib/libcrypto/man/ASN1_TIME_set.3
+++ b/src/lib/libcrypto/man/ASN1_TIME_set.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_TIME_set.3,v 1.22 2024/02/18 16:30:17 tb Exp $
+.\" $OpenBSD: ASN1_TIME_set.3,v 1.23 2024/03/05 18:30:40 tb Exp $
 .\" full merge up to: OpenSSL 3d0f1cb9 Jul 11 03:01:24 2017 +0800
 .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 18 2024 $
+.Dd $Mdocdate: March 5 2024 $
 .Dt ASN1_TIME_SET 3
 .Os
 .Sh NAME
@@ -659,7 +659,6 @@ BIO_free(b);
 .Ed
 .Sh SEE ALSO
 .Xr ASN1_TIME_new 3 ,
-.Xr ASN1_time_parse 3 ,
 .Xr X509_cmp_time 3
 .Sh STANDARDS
 The usage of the ASN.1
diff --git a/src/lib/libcrypto/man/ASN1_time_parse.3 b/src/lib/libcrypto/man/ASN1_time_parse.3
deleted file mode 100644
index 6ec45e5dcc..0000000000
--- a/src/lib/libcrypto/man/ASN1_time_parse.3
+++ /dev/null
@@ -1,141 +0,0 @@
-.\" $OpenBSD: ASN1_time_parse.3,v 1.9 2020/11/02 17:45:35 tb Exp $
-.\"
-.\" Copyright (c) 2016 Bob Beck <beck@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: November 2 2020 $
-.Dt ASN1_TIME_PARSE 3
-.Os
-.Sh NAME
-.Nm ASN1_time_parse ,
-.Nm ASN1_time_tm_cmp ,
-.Nm ASN1_TIME_set_tm
-.Nd LibreSSL utilities for ASN.1 time types
-.Sh SYNOPSIS
-.In openssl/asn1.h
-.Ft int
-.Fn ASN1_time_parse "const char *bytes" "size_t len" "struct tm *tm" "int mode"
-.Ft int
-.Fn ASN1_time_tm_cmp "struct tm *tm1" "struct tm *tm2"
-.Ft ASN1_TIME *
-.Fn ASN1_TIME_set_tm "ASN1_TIME *s" "struct tm *tm"
-.Sh DESCRIPTION
-The
-.Fn ASN1_time_parse
-function parses an ASN.1 time string of
-.Ar len
-bytes starting at
-.Ar bytes .
-The resulting time is stored in
-.Ar tm
-if
-.Ar tm
-is not
-.Dv NULL .
-.Pp
-The
-.Ar mode
-parameter must be one of
-.Bl -bullet -offset four
-.It
-0 to parse a time as specified in RFC 5280 for an X509 object,
-which may be either a UTC time or a Generalized time.
-.It
-.Dv V_ASN1_UTCTIME
-to parse an RFC 5280 format UTC time.
-.It
-.Dv V_ASN1_GENERALIZEDTIME
-to parse an RFC 5280 format Generalized time.
-.El
-.Pp
-The
-.Fn ASN1_time_tm_cmp
-function compares two times in
-.Ar tm1
-and
-.Ar tm2 .
-.Pp
-The function
-.Fn ASN1_TIME_set_tm
-sets the
-.Vt ASN1_TIME
-structure
-.Fa s
-to the time represented by the
-.Vt struct tm
-value pointed to by
-.Fa tm .
-If
-.Fa s
-is
-.Dv NULL ,
-a new
-.Vt ASN1_TIME
-structure is allocated and returned.
-.Sh RETURN VALUES
-.Fn ASN1_time_parse
-returns
-.Bl -bullet -offset four
-.It
--1 if the string was invalid for the
-.Ar mode
-specified.
-.It
-.Dv V_ASN1_UTCTIME
-if the string parsed as a valid UTC time.
-.It
-.Dv V_ASN1_GENERALIZEDTIME
-if the string parsed as a valid Generalized time.
-.El
-.Pp
-.Fn ASN1_time_tm_cmp
-returns
-.Bl -bullet -offset four
-.It
--1 if
-.Ar tm1
-is less than
-.Ar tm2 .
-.It
-1 if
-.Ar tm1
-is greater than
-.Ar tm2 .
-.It
-0 if
-.Ar tm1
-is the same as
-.Ar tm2 .
-.El
-.Pp
-.Fn ASN1_TIME_set_tm
-returns a pointer to an
-.Vt ASN1_TIME
-structure or
-.Dv NULL
-if an error occurred.
-.Sh SEE ALSO
-.Xr ASN1_TIME_new 3 ,
-.Xr ASN1_TIME_set 3 ,
-.Xr X509_cmp_time 3
-.Sh HISTORY
-.Fn ASN1_time_parse
-and
-.Fn ASN1_time_tm_cmp
-first appeared in
-.Ox 6.1
-and
-.Fn ASN1_TIME_set_tm
-in
-.Ox 6.2 .
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 565f583127..1eec56fd0e 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.284 2024/03/05 17:21:40 tb Exp $
+# $OpenBSD: Makefile,v 1.285 2024/03/05 18:30:40 tb Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,6 @@ MAN=	\
         ASN1_mbstring_copy.3 \
         ASN1_parse_dump.3 \
         ASN1_put_object.3 \
-        ASN1_time_parse.3 \
         ASRange_new.3 \
         AUTHORITY_KEYID_new.3 \
         BASIC_CONSTRAINTS_new.3 \
diff --git a/src/lib/libcrypto/man/X509_cmp_time.3 b/src/lib/libcrypto/man/X509_cmp_time.3
index 0f2afdad02..bb430dfbb7 100644
--- a/src/lib/libcrypto/man/X509_cmp_time.3
+++ b/src/lib/libcrypto/man/X509_cmp_time.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_cmp_time.3,v 1.11 2021/11/12 14:34:57 schwarze Exp $
+.\" $OpenBSD: X509_cmp_time.3,v 1.12 2024/03/05 18:30:40 tb Exp $
 .\" full merge up to: OpenSSL 83cf7abf May 29 13:07:08 2018 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 12 2021 $
+.Dd $Mdocdate: March 5 2024 $
 .Dt X509_CMP_TIME 3
 .Os
 .Sh NAME
@@ -108,8 +108,6 @@
 .Fn X509_cmp_time
 parses
 .Fa asn1_time
-with
-.Xr ASN1_time_parse 3
 and compares it to
 .Fa cmp_time ,
 or to the current time if
@@ -182,7 +180,6 @@ structure or
 on error.
 .Sh SEE ALSO
 .Xr ASN1_TIME_new 3 ,
-.Xr ASN1_time_parse 3 ,
 .Xr ASN1_TIME_set 3 ,
 .Xr time 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/X509_get0_notBefore.3 b/src/lib/libcrypto/man/X509_get0_notBefore.3
index 53b18d5991..5e5c08b79a 100644
--- a/src/lib/libcrypto/man/X509_get0_notBefore.3
+++ b/src/lib/libcrypto/man/X509_get0_notBefore.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get0_notBefore.3,v 1.6 2023/06/06 16:20:13 schwarze Exp $
+.\" $OpenBSD: X509_get0_notBefore.3,v 1.7 2024/03/05 18:30:40 tb Exp $
 .\" content checked up to: OpenSSL 27b138e9 May 19 00:16:38 2017 +0000
 .\"
 .\" Copyright (c) 2018, 2020 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 6 2023 $
+.Dd $Mdocdate: March 5 2024 $
 .Dt X509_GET0_NOTBEFORE 3
 .Os
 .Sh NAME
@@ -230,7 +230,6 @@ determining reasons for failure with
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
 .Xr ASN1_TIME_set 3 ,
-.Xr ASN1_TIME_set_tm 3 ,
 .Xr X509_cmp_time 3 ,
 .Xr X509_CRL_get0_by_serial 3 ,
 .Xr X509_CRL_new 3 ,