summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2025-08-10 06:36:45 +0000
committerbeck <>2025-08-10 06:36:45 +0000
commit4fd25eed849a1e1cc5f0497cf86579813203b406 (patch)
treeac66e578d740d5f3169d291084f5f52735a54a20 /src
parent3ff9e1e339c8850a5fc384829ec28de8a2a4d64c (diff)
downloadopenbsd-4fd25eed849a1e1cc5f0497cf86579813203b406.tar.gz
openbsd-4fd25eed849a1e1cc5f0497cf86579813203b406.tar.bz2
openbsd-4fd25eed849a1e1cc5f0497cf86579813203b406.zip
Clean up and move define to correct place.
ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509.h3
-rw-r--r--src/lib/libcrypto/x509/x509_policy.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 729a06d0ed..4148a6398e 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.123 2025/07/16 15:59:26 tb Exp $ */ 1/* $OpenBSD: x509.h,v 1.124 2025/08/10 06:36:45 beck 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 *
@@ -995,6 +995,7 @@ void ERR_load_X509_strings(void);
995#define X509_R_ERR_ASN1_LIB 102 995#define X509_R_ERR_ASN1_LIB 102
996#define X509_R_INVALID_DIRECTORY 113 996#define X509_R_INVALID_DIRECTORY 113
997#define X509_R_INVALID_FIELD_NAME 119 997#define X509_R_INVALID_FIELD_NAME 119
998#define X509_R_INVALID_POLICY_EXTENSION 201
998#define X509_R_INVALID_TRUST 123 999#define X509_R_INVALID_TRUST 123
999#define X509_R_INVALID_VERSION 137 1000#define X509_R_INVALID_VERSION 137
1000#define X509_R_KEY_TYPE_MISMATCH 115 1001#define X509_R_KEY_TYPE_MISMATCH 115
diff --git a/src/lib/libcrypto/x509/x509_policy.c b/src/lib/libcrypto/x509/x509_policy.c
index 8267e8dc49..2df965aad1 100644
--- a/src/lib/libcrypto/x509/x509_policy.c
+++ b/src/lib/libcrypto/x509/x509_policy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_policy.c,v 1.32 2025/05/10 05:54:39 tb Exp $ */ 1/* $OpenBSD: x509_policy.c,v 1.33 2025/08/10 06:36:45 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2022, Google Inc. 3 * Copyright (c) 2022, Google Inc.
4 * 4 *
@@ -27,9 +27,6 @@
27#include "x509_internal.h" 27#include "x509_internal.h"
28#include "x509_local.h" 28#include "x509_local.h"
29 29
30/* XXX move to proper place */
31#define X509_R_INVALID_POLICY_EXTENSION 201
32
33/* 30/*
34 * This file computes the X.509 policy tree, as described in RFC 5280, 31 * This file computes the X.509 policy tree, as described in RFC 5280,
35 * section 6.1 and RFC 9618. It differs in that: 32 * section 6.1 and RFC 9618. It differs in that: