diff options
author | jsing <> | 2018-02-22 16:47:50 +0000 |
---|---|---|
committer | jsing <> | 2018-02-22 16:47:50 +0000 |
commit | 642a7937cb73c86e8adaffc18ab73360e6d81f2c (patch) | |
tree | 16b6f43d6440e4dcf7bcabedb50af9ced20999c2 | |
parent | f893e5308029c2b4c7a91260a11cea3204ee39ee (diff) | |
download | openbsd-642a7937cb73c86e8adaffc18ab73360e6d81f2c.tar.gz openbsd-642a7937cb73c86e8adaffc18ab73360e6d81f2c.tar.bz2 openbsd-642a7937cb73c86e8adaffc18ab73360e6d81f2c.zip |
Provide X509_REVOKED_get0_extensions(), X509_REVOKED_get0_revocationDate()
and X509_REVOKED_get0_serialNumber().
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509cset.c | 20 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 2b674655ae..511c44cd86 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2808,6 +2808,9 @@ X509_REVOKED_add1_ext_i2d | |||
2808 | X509_REVOKED_add_ext | 2808 | X509_REVOKED_add_ext |
2809 | X509_REVOKED_delete_ext | 2809 | X509_REVOKED_delete_ext |
2810 | X509_REVOKED_free | 2810 | X509_REVOKED_free |
2811 | X509_REVOKED_get0_extensions | ||
2812 | X509_REVOKED_get0_revocationDate | ||
2813 | X509_REVOKED_get0_serialNumber | ||
2811 | X509_REVOKED_get_ext | 2814 | X509_REVOKED_get_ext |
2812 | X509_REVOKED_get_ext_by_NID | 2815 | X509_REVOKED_get_ext_by_NID |
2813 | X509_REVOKED_get_ext_by_OBJ | 2816 | X509_REVOKED_get_ext_by_OBJ |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 6f0f5f4dec..c7695b4663 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.32 2018/02/20 17:09:20 jsing Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.33 2018/02/22 16:47:50 jsing 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 | * |
@@ -1024,8 +1024,11 @@ int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm); | |||
1024 | int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm); | 1024 | int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm); |
1025 | int X509_CRL_sort(X509_CRL *crl); | 1025 | int X509_CRL_sort(X509_CRL *crl); |
1026 | 1026 | ||
1027 | int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial); | 1027 | const STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *x); |
1028 | const ASN1_TIME *X509_REVOKED_get0_revocationDate(const X509_REVOKED *x); | ||
1029 | const ASN1_INTEGER *X509_REVOKED_get0_serialNumber(const X509_REVOKED *x); | ||
1028 | int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm); | 1030 | int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm); |
1031 | int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial); | ||
1029 | 1032 | ||
1030 | int X509_REQ_check_private_key(X509_REQ *x509,EVP_PKEY *pkey); | 1033 | int X509_REQ_check_private_key(X509_REQ *x509,EVP_PKEY *pkey); |
1031 | 1034 | ||
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c index afc1f0f2b3..88de63debd 100644 --- a/src/lib/libcrypto/x509/x509cset.c +++ b/src/lib/libcrypto/x509/x509cset.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509cset.c,v 1.11 2015/09/30 17:49:59 jsing Exp $ */ | 1 | /* $OpenBSD: x509cset.c,v 1.12 2018/02/22 16:47:50 jsing 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 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -136,6 +136,24 @@ X509_CRL_sort(X509_CRL *c) | |||
136 | return 1; | 136 | return 1; |
137 | } | 137 | } |
138 | 138 | ||
139 | const STACK_OF(X509_EXTENSION) * | ||
140 | X509_REVOKED_get0_extensions(const X509_REVOKED *x) | ||
141 | { | ||
142 | return x->extensions; | ||
143 | } | ||
144 | |||
145 | const ASN1_TIME * | ||
146 | X509_REVOKED_get0_revocationDate(const X509_REVOKED *x) | ||
147 | { | ||
148 | return x->revocationDate; | ||
149 | } | ||
150 | |||
151 | const ASN1_INTEGER * | ||
152 | X509_REVOKED_get0_serialNumber(const X509_REVOKED *x) | ||
153 | { | ||
154 | return x->serialNumber; | ||
155 | } | ||
156 | |||
139 | int | 157 | int |
140 | X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) | 158 | X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) |
141 | { | 159 | { |