summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2018-02-24 21:39:29 +0000
committerschwarze <>2018-02-24 21:39:29 +0000
commit866b37d05210e70dce3910ecb52606722b7a342b (patch)
treebeac9969480ee01ad62c9cd247530ffcdfd7eeb1
parentfa066c25d42793344e20c2d5ca7b5374e9e11217 (diff)
downloadopenbsd-866b37d05210e70dce3910ecb52606722b7a342b.tar.gz
openbsd-866b37d05210e70dce3910ecb52606722b7a342b.tar.bz2
openbsd-866b37d05210e70dce3910ecb52606722b7a342b.zip
In x509.h rev. 1.33 2018/02/22 16:47:50, jsing@ provided
X509_REVOKED_get0_serialNumber(3) and X509_REVOKED_get0_revocationDate(3). Merge the documentation from OpenSSL, but put it into X509_REVOKED_new(3) rather than into X509_CRL_get0_by_serial(3) because it fits better there.
-rw-r--r--src/lib/libcrypto/man/X509V3_get_d2i.35
-rw-r--r--src/lib/libcrypto/man/X509_REVOKED_new.332
-rw-r--r--src/lib/libcrypto/man/X509v3_get_ext_by_NID.35
3 files changed, 33 insertions, 9 deletions
diff --git a/src/lib/libcrypto/man/X509V3_get_d2i.3 b/src/lib/libcrypto/man/X509V3_get_d2i.3
index f21471b00c..9192767464 100644
--- a/src/lib/libcrypto/man/X509V3_get_d2i.3
+++ b/src/lib/libcrypto/man/X509V3_get_d2i.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: X509V3_get_d2i.3,v 1.8 2018/02/24 20:57:49 schwarze Exp $ 1.\" $OpenBSD: X509V3_get_d2i.3,v 1.9 2018/02/24 21:39:29 schwarze Exp $
2.\" full merge up to: OpenSSL ff7fbfd5 Nov 2 11:52:01 2015 +0000 2.\" full merge up to: OpenSSL ff7fbfd5 Nov 2 11:52:01 2015 +0000
3.\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 3.\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
4.\" 4.\"
@@ -403,4 +403,5 @@ if no extensions are present.
403.Xr X509_get_pubkey 3 , 403.Xr X509_get_pubkey 3 ,
404.Xr X509_get_subject_name 3 , 404.Xr X509_get_subject_name 3 ,
405.Xr X509_get_version 3 , 405.Xr X509_get_version 3 ,
406.Xr X509_new 3 406.Xr X509_new 3 ,
407.Xr X509_REVOKED_new 3
diff --git a/src/lib/libcrypto/man/X509_REVOKED_new.3 b/src/lib/libcrypto/man/X509_REVOKED_new.3
index f06075fcc2..5ffe949678 100644
--- a/src/lib/libcrypto/man/X509_REVOKED_new.3
+++ b/src/lib/libcrypto/man/X509_REVOKED_new.3
@@ -1,5 +1,6 @@
1.\" $OpenBSD: X509_REVOKED_new.3,v 1.2 2016/12/25 22:15:10 schwarze Exp $ 1.\" $OpenBSD: X509_REVOKED_new.3,v 1.3 2018/02/24 21:39:29 schwarze Exp $
2.\" OpenSSL X509_CRL_get0_by_serial.pod 99d63d46 Oct 26 13:56:48 2016 -0400 2.\" full merge up to:
3.\" OpenSSL man3/X509_CRL_get0_by_serial cdd6c8c5 Mar 20 12:29:37 2017 +0100
3.\" 4.\"
4.\" This file is a derived work. 5.\" This file is a derived work.
5.\" The changes are covered by the following Copyright and license: 6.\" The changes are covered by the following Copyright and license:
@@ -65,21 +66,31 @@
65.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 66.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
66.\" OF THE POSSIBILITY OF SUCH DAMAGE. 67.\" OF THE POSSIBILITY OF SUCH DAMAGE.
67.\" 68.\"
68.Dd $Mdocdate: December 25 2016 $ 69.Dd $Mdocdate: February 24 2018 $
69.Dt X509_REVOKED_NEW 3 70.Dt X509_REVOKED_NEW 3
70.Os 71.Os
71.Sh NAME 72.Sh NAME
72.Nm X509_REVOKED_new , 73.Nm X509_REVOKED_new ,
73.Nm X509_REVOKED_free , 74.Nm X509_REVOKED_free ,
75.Nm X509_REVOKED_get0_serialNumber ,
76.Nm X509_REVOKED_get0_revocationDate ,
74.Nm X509_REVOKED_set_serialNumber , 77.Nm X509_REVOKED_set_serialNumber ,
75.Nm X509_REVOKED_set_revocationDate 78.Nm X509_REVOKED_set_revocationDate
76.Nd create and change an X.509 CRL revoked entry 79.Nd create, change, and inspect an X.509 CRL revoked entry
77.Sh SYNOPSIS 80.Sh SYNOPSIS
78.In openssl/x509.h 81.In openssl/x509.h
79.Ft X509_REVOKED * 82.Ft X509_REVOKED *
80.Fn X509_REVOKED_new void 83.Fn X509_REVOKED_new void
81.Ft void 84.Ft void
82.Fn X509_REVOKED_free "X509_REVOKED *r" 85.Fn X509_REVOKED_free "X509_REVOKED *r"
86.Ft const ASN1_INTEGER *
87.Fo X509_REVOKED_get0_serialNumber
88.Fa "const X509_REVOKED *r"
89.Fc
90.Ft const ASN1_TIME *
91.Fo X509_REVOKED_get0_revocationDate
92.Fa "const X509_REVOKED *r"
93.Fc
83.Ft int 94.Ft int
84.Fo X509_REVOKED_set_serialNumber 95.Fo X509_REVOKED_set_serialNumber
85.Fa "X509_REVOKED *r" 96.Fa "X509_REVOKED *r"
@@ -133,6 +144,14 @@ object or
133.Dv NULL 144.Dv NULL
134if an error occurs. 145if an error occurs.
135.Pp 146.Pp
147.Fn X509_REVOKED_get0_serialNumber
148returns an internal pointer to the serial number of
149.Fa r .
150.Pp
151.Fn X509_REVOKED_get0_revocationDate
152returns an internal pointer to the revocation date of
153.Fa r .
154.Pp
136.Fn X509_REVOKED_set_serialNumber 155.Fn X509_REVOKED_set_serialNumber
137and 156and
138.Fn X509_REVOKED_set_revocationDate 157.Fn X509_REVOKED_set_revocationDate
@@ -141,7 +160,10 @@ return 1 for success or 0 for failure.
141.Xr d2i_X509_CRL 3 , 160.Xr d2i_X509_CRL 3 ,
142.Xr ERR_get_error 3 , 161.Xr ERR_get_error 3 ,
143.Xr PEM_read_X509_CRL 3 , 162.Xr PEM_read_X509_CRL 3 ,
144.Xr X509_CRL_get0_by_serial 3 163.Xr X509_CRL_get0_by_serial 3 ,
164.Xr X509_EXTENSION_new 3 ,
165.Xr X509_REVOKED_get_ext 3 ,
166.Xr X509_REVOKED_get_ext_d2i 3
145.Sh STANDARDS 167.Sh STANDARDS
146RFC 5280: Internet X.509 Public Key Infrastructure Certificate and 168RFC 5280: Internet X.509 Public Key Infrastructure Certificate and
147Certificate Revocation List (CRL) Profile, section 5.1: CRL Fields 169Certificate Revocation List (CRL) Profile, section 5.1: CRL Fields
diff --git a/src/lib/libcrypto/man/X509v3_get_ext_by_NID.3 b/src/lib/libcrypto/man/X509v3_get_ext_by_NID.3
index b5e1981797..cd31fe99f4 100644
--- a/src/lib/libcrypto/man/X509v3_get_ext_by_NID.3
+++ b/src/lib/libcrypto/man/X509v3_get_ext_by_NID.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: X509v3_get_ext_by_NID.3,v 1.4 2017/07/05 11:43:09 schwarze Exp $ 1.\" $OpenBSD: X509v3_get_ext_by_NID.3,v 1.5 2018/02/24 21:39:29 schwarze Exp $
2.\" OpenSSL c952780c Jun 21 07:03:34 2016 -0400 2.\" OpenSSL c952780c Jun 21 07:03:34 2016 -0400
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>. 4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: July 5 2017 $ 51.Dd $Mdocdate: February 24 2018 $
52.Dt X509V3_GET_EXT_BY_NID 3 52.Dt X509V3_GET_EXT_BY_NID 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -385,4 +385,5 @@ returns a stack of extensions or
385on error. 385on error.
386.Sh SEE ALSO 386.Sh SEE ALSO
387.Xr X509_EXTENSION_new 3 , 387.Xr X509_EXTENSION_new 3 ,
388.Xr X509_REVOKED_new 3 ,
388.Xr X509V3_get_d2i 3 389.Xr X509V3_get_d2i 3