summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts
diff options
context:
space:
mode:
authortb <>2021-11-01 20:53:08 +0000
committertb <>2021-11-01 20:53:08 +0000
commitb1d784eb6c4f1df06e96cfc40e2434cf76165cbe (patch)
treecbf2de4e6ef2a9e9d9281e6e60c30149cd648fd1 /src/lib/libcrypto/ts
parent95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db (diff)
downloadopenbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.gz
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.tar.bz2
openbsd-b1d784eb6c4f1df06e96cfc40e2434cf76165cbe.zip
Move the now internal X.509-related structs into x509_lcl.h.
Garbage collect the now unused LIBRESSL_CRYPTO_INTERNAL and LIBRESSL_OPAQUE_X509. Include "x509_lcl.h" where needed and fix a couple of unnecessary reacharounds. ok jsing
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r--src/lib/libcrypto/ts/ts_lib.c4
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_sign.c4
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_verify.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c
index 293564118f..cdfa9db351 100644
--- a/src/lib/libcrypto/ts/ts_lib.c
+++ b/src/lib/libcrypto/ts/ts_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_lib.c,v 1.10 2015/09/10 14:29:22 jsing Exp $ */ 1/* $OpenBSD: ts_lib.c,v 1.11 2021/11/01 20:53:08 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -64,6 +64,8 @@
64#include <openssl/ts.h> 64#include <openssl/ts.h>
65#include <openssl/x509v3.h> 65#include <openssl/x509v3.h>
66 66
67#include "x509_lcl.h"
68
67/* Local function declarations. */ 69/* Local function declarations. */
68 70
69/* Function definitions. */ 71/* Function definitions. */
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 6125fdd4be..828407aa4b 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_rsp_sign.c,v 1.23 2019/07/03 03:24:04 deraadt Exp $ */ 1/* $OpenBSD: ts_rsp_sign.c,v 1.24 2021/11/01 20:53:08 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -65,6 +65,8 @@
65#include <openssl/pkcs7.h> 65#include <openssl/pkcs7.h>
66#include <openssl/ts.h> 66#include <openssl/ts.h>
67 67
68#include "x509_lcl.h"
69
68/* Private function declarations. */ 70/* Private function declarations. */
69 71
70static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); 72static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index 46704dfd2b..2e72ff47ae 100644
--- a/src/lib/libcrypto/ts/ts_rsp_verify.c
+++ b/src/lib/libcrypto/ts/ts_rsp_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_rsp_verify.c,v 1.21 2021/07/02 11:15:08 schwarze Exp $ */ 1/* $OpenBSD: ts_rsp_verify.c,v 1.22 2021/11/01 20:53:08 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -64,6 +64,8 @@
64#include <openssl/pkcs7.h> 64#include <openssl/pkcs7.h>
65#include <openssl/ts.h> 65#include <openssl/ts.h>
66 66
67#include "x509_lcl.h"
68
67/* Private function declarations. */ 69/* Private function declarations. */
68 70
69static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted, 71static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,