summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-01-28 19:12:20 +0000
committertb <>2023-01-28 19:12:20 +0000
commit7782a729f26fe17629a646b9be50bc25d37dd395 (patch)
treebcb206e6ff9630d1c968f34a070bcef4f60fe4ef
parent5c1c0f42353a74450c3661fb2e5409baf64c174b (diff)
downloadopenbsd-7782a729f26fe17629a646b9be50bc25d37dd395.tar.gz
openbsd-7782a729f26fe17629a646b9be50bc25d37dd395.tar.bz2
openbsd-7782a729f26fe17629a646b9be50bc25d37dd395.zip
Switch regress to using x509_verify.h from libcrypto instead of the
one in /usr/include/openssl.
-rw-r--r--src/regress/lib/libcrypto/x509/callback.c5
-rw-r--r--src/regress/lib/libcrypto/x509/callbackfailures.c5
-rw-r--r--src/regress/lib/libcrypto/x509/expirecallback.c5
-rw-r--r--src/regress/lib/libcrypto/x509/verify.c5
4 files changed, 12 insertions, 8 deletions
diff --git a/src/regress/lib/libcrypto/x509/callback.c b/src/regress/lib/libcrypto/x509/callback.c
index b2531fe819..a01ffd5d6f 100644
--- a/src/regress/lib/libcrypto/x509/callback.c
+++ b/src/regress/lib/libcrypto/x509/callback.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: callback.c,v 1.3 2021/10/31 08:27:15 tb Exp $ */ 1/* $OpenBSD: callback.c,v 1.4 2023/01/28 19:12:20 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
24#include <openssl/pem.h> 24#include <openssl/pem.h>
25#include <openssl/x509.h> 25#include <openssl/x509.h>
26#include <openssl/x509v3.h> 26#include <openssl/x509v3.h>
27#include <openssl/x509_verify.h> 27
28#include "x509_verify.h"
28 29
29#define MODE_MODERN_VFY 0 30#define MODE_MODERN_VFY 0
30#define MODE_MODERN_VFY_DIR 1 31#define MODE_MODERN_VFY_DIR 1
diff --git a/src/regress/lib/libcrypto/x509/callbackfailures.c b/src/regress/lib/libcrypto/x509/callbackfailures.c
index f714adffff..53570e1532 100644
--- a/src/regress/lib/libcrypto/x509/callbackfailures.c
+++ b/src/regress/lib/libcrypto/x509/callbackfailures.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: callbackfailures.c,v 1.1 2022/06/28 07:56:34 beck Exp $ */ 1/* $OpenBSD: callbackfailures.c,v 1.2 2023/01/28 19:12:20 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
24#include <openssl/pem.h> 24#include <openssl/pem.h>
25#include <openssl/x509.h> 25#include <openssl/x509.h>
26#include <openssl/x509v3.h> 26#include <openssl/x509v3.h>
27#include <openssl/x509_verify.h> 27
28#include "x509_verify.h"
28 29
29#define MODE_MODERN_VFY 0 30#define MODE_MODERN_VFY 0
30#define MODE_MODERN_VFY_DIR 1 31#define MODE_MODERN_VFY_DIR 1
diff --git a/src/regress/lib/libcrypto/x509/expirecallback.c b/src/regress/lib/libcrypto/x509/expirecallback.c
index f7dcff8e94..88cef6fd01 100644
--- a/src/regress/lib/libcrypto/x509/expirecallback.c
+++ b/src/regress/lib/libcrypto/x509/expirecallback.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: expirecallback.c,v 1.2 2022/10/17 18:44:36 jsing Exp $ */ 1/* $OpenBSD: expirecallback.c,v 1.3 2023/01/28 19:12:20 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -24,7 +24,8 @@
24#include <openssl/pem.h> 24#include <openssl/pem.h>
25#include <openssl/x509.h> 25#include <openssl/x509.h>
26#include <openssl/x509v3.h> 26#include <openssl/x509v3.h>
27#include <openssl/x509_verify.h> 27
28#include "x509_verify.h"
28 29
29#define MODE_MODERN_VFY 0 30#define MODE_MODERN_VFY 0
30#define MODE_MODERN_VFY_DIR 1 31#define MODE_MODERN_VFY_DIR 1
diff --git a/src/regress/lib/libcrypto/x509/verify.c b/src/regress/lib/libcrypto/x509/verify.c
index 93a6e43c51..e49180f7f1 100644
--- a/src/regress/lib/libcrypto/x509/verify.c
+++ b/src/regress/lib/libcrypto/x509/verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: verify.c,v 1.10 2022/10/17 18:36:52 jsing Exp $ */ 1/* $OpenBSD: verify.c,v 1.11 2023/01/28 19:12:20 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -25,7 +25,8 @@
25#include <openssl/pem.h> 25#include <openssl/pem.h>
26#include <openssl/x509.h> 26#include <openssl/x509.h>
27#include <openssl/x509v3.h> 27#include <openssl/x509v3.h>
28#include <openssl/x509_verify.h> 28
29#include "x509_verify.h"
29 30
30#define MODE_MODERN_VFY 0 31#define MODE_MODERN_VFY 0
31#define MODE_MODERN_VFY_DIR 1 32#define MODE_MODERN_VFY_DIR 1