summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2022-05-08 20:59:32 +0000
committertb <>2022-05-08 20:59:32 +0000
commit8cd405b40cda8503a806224763bb295465187159 (patch)
tree5167ca966a810401b634b9f50af18b016856391f /src/lib
parentb7c0075171fa55c711c596c91e3ecb297d3e0cd4 (diff)
downloadopenbsd-8cd405b40cda8503a806224763bb295465187159.tar.gz
openbsd-8cd405b40cda8503a806224763bb295465187159.tar.bz2
openbsd-8cd405b40cda8503a806224763bb295465187159.zip
Remove openssl/cterr.h and inline it in openssl/ct.h
ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Makefile3
-rw-r--r--src/lib/libcrypto/ct/ct.h57
-rw-r--r--src/lib/libcrypto/ct/ct_err.c4
-rw-r--r--src/lib/libcrypto/ct/cterr.h127
4 files changed, 58 insertions, 133 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 8bdf5bb847..d6432cdc51 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.73 2022/05/05 08:50:35 tb Exp $ 1# $OpenBSD: Makefile,v 1.74 2022/05/08 20:59:32 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -377,7 +377,6 @@ HDRS=\
377 ${LCRYPTO_SRC}/conf/conf_api.h \ 377 ${LCRYPTO_SRC}/conf/conf_api.h \
378 ${LCRYPTO_SRC}/crypto.h \ 378 ${LCRYPTO_SRC}/crypto.h \
379 ${LCRYPTO_SRC}/ct/ct.h \ 379 ${LCRYPTO_SRC}/ct/ct.h \
380 ${LCRYPTO_SRC}/ct/cterr.h \
381 ${LCRYPTO_SRC}/curve25519/curve25519.h \ 380 ${LCRYPTO_SRC}/curve25519/curve25519.h \
382 ${LCRYPTO_SRC}/des/des.h \ 381 ${LCRYPTO_SRC}/des/des.h \
383 ${LCRYPTO_SRC}/dh/dh.h \ 382 ${LCRYPTO_SRC}/dh/dh.h \
diff --git a/src/lib/libcrypto/ct/ct.h b/src/lib/libcrypto/ct/ct.h
index 2b5490377f..895046e00a 100644
--- a/src/lib/libcrypto/ct/ct.h
+++ b/src/lib/libcrypto/ct/ct.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ct.h,v 1.6 2021/12/18 16:50:40 tb Exp $ */ 1/* $OpenBSD: ct.h,v 1.7 2022/05/08 20:59:32 tb Exp $ */
2/* 2/*
3 * Public API for Certificate Transparency (CT). 3 * Public API for Certificate Transparency (CT).
4 * Written by Rob Percival (robpercival@google.com) for the OpenSSL project. 4 * Written by Rob Percival (robpercival@google.com) for the OpenSSL project.
@@ -61,7 +61,6 @@
61#include <openssl/ossl_typ.h> 61#include <openssl/ossl_typ.h>
62#include <openssl/safestack.h> 62#include <openssl/safestack.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64#include <openssl/cterr.h>
65#ifdef __cplusplus 64#ifdef __cplusplus
66extern "C" { 65extern "C" {
67#endif 66#endif
@@ -507,6 +506,60 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file);
507 */ 506 */
508int CTLOG_STORE_load_default_file(CTLOG_STORE *store); 507int CTLOG_STORE_load_default_file(CTLOG_STORE *store);
509 508
509int ERR_load_CT_strings(void);
510
511/*
512 * CT function codes.
513 */
514# define CT_F_CTLOG_NEW 117
515# define CT_F_CTLOG_NEW_FROM_BASE64 118
516# define CT_F_CTLOG_NEW_FROM_CONF 119
517# define CT_F_CTLOG_STORE_LOAD_CTX_NEW 122
518# define CT_F_CTLOG_STORE_LOAD_FILE 123
519# define CT_F_CTLOG_STORE_LOAD_LOG 130
520# define CT_F_CTLOG_STORE_NEW 131
521# define CT_F_CT_BASE64_DECODE 124
522# define CT_F_CT_POLICY_EVAL_CTX_NEW 133
523# define CT_F_CT_V1_LOG_ID_FROM_PKEY 125
524# define CT_F_I2O_SCT 107
525# define CT_F_I2O_SCT_LIST 108
526# define CT_F_I2O_SCT_SIGNATURE 109
527# define CT_F_O2I_SCT 110
528# define CT_F_O2I_SCT_LIST 111
529# define CT_F_O2I_SCT_SIGNATURE 112
530# define CT_F_SCT_CTX_NEW 126
531# define CT_F_SCT_CTX_VERIFY 128
532# define CT_F_SCT_NEW 100
533# define CT_F_SCT_NEW_FROM_BASE64 127
534# define CT_F_SCT_SET0_LOG_ID 101
535# define CT_F_SCT_SET1_EXTENSIONS 114
536# define CT_F_SCT_SET1_LOG_ID 115
537# define CT_F_SCT_SET1_SIGNATURE 116
538# define CT_F_SCT_SET_LOG_ENTRY_TYPE 102
539# define CT_F_SCT_SET_SIGNATURE_NID 103
540# define CT_F_SCT_SET_VERSION 104
541
542/*
543 * CT reason codes.
544 */
545# define CT_R_BASE64_DECODE_ERROR 108
546# define CT_R_INVALID_LOG_ID_LENGTH 100
547# define CT_R_LOG_CONF_INVALID 109
548# define CT_R_LOG_CONF_INVALID_KEY 110
549# define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
550# define CT_R_LOG_CONF_MISSING_KEY 112
551# define CT_R_LOG_KEY_INVALID 113
552# define CT_R_SCT_FUTURE_TIMESTAMP 116
553# define CT_R_SCT_INVALID 104
554# define CT_R_SCT_INVALID_SIGNATURE 107
555# define CT_R_SCT_LIST_INVALID 105
556# define CT_R_SCT_LOG_ID_MISMATCH 114
557# define CT_R_SCT_NOT_SET 106
558# define CT_R_SCT_UNSUPPORTED_VERSION 115
559# define CT_R_UNRECOGNIZED_SIGNATURE_NID 101
560# define CT_R_UNSUPPORTED_ENTRY_TYPE 102
561# define CT_R_UNSUPPORTED_VERSION 103
562
510#ifdef __cplusplus 563#ifdef __cplusplus
511} 564}
512#endif 565#endif
diff --git a/src/lib/libcrypto/ct/ct_err.c b/src/lib/libcrypto/ct/ct_err.c
index fc9ca0cbf8..01b6a7c209 100644
--- a/src/lib/libcrypto/ct/ct_err.c
+++ b/src/lib/libcrypto/ct/ct_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ct_err.c,v 1.5 2021/12/18 16:50:40 tb Exp $ */ 1/* $OpenBSD: ct_err.c,v 1.6 2022/05/08 20:59:32 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -58,8 +58,8 @@
58 * only reason strings will be preserved. 58 * only reason strings will be preserved.
59 */ 59 */
60 60
61#include <openssl/ct.h>
61#include <openssl/err.h> 62#include <openssl/err.h>
62#include <openssl/cterr.h>
63 63
64#ifndef OPENSSL_NO_ERR 64#ifndef OPENSSL_NO_ERR
65 65
diff --git a/src/lib/libcrypto/ct/cterr.h b/src/lib/libcrypto/ct/cterr.h
deleted file mode 100644
index 07ae519bb2..0000000000
--- a/src/lib/libcrypto/ct/cterr.h
+++ /dev/null
@@ -1,127 +0,0 @@
1/* $OpenBSD: cterr.h,v 1.5 2021/12/18 16:50:40 tb Exp $ */
2/* ====================================================================
3 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in
14 * the documentation and/or other materials provided with the
15 * distribution.
16 *
17 * 3. All advertising materials mentioning features or use of this
18 * software must display the following acknowledgment:
19 * "This product includes software developed by the OpenSSL Project
20 * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
21 *
22 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23 * endorse or promote products derived from this software without
24 * prior written permission. For written permission, please contact
25 * openssl-core@OpenSSL.org.
26 *
27 * 5. Products derived from this software may not be called "OpenSSL"
28 * nor may "OpenSSL" appear in their names without prior written
29 * permission of the OpenSSL Project.
30 *
31 * 6. Redistributions of any form whatsoever must retain the following
32 * acknowledgment:
33 * "This product includes software developed by the OpenSSL Project
34 * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
35 *
36 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47 * OF THE POSSIBILITY OF SUCH DAMAGE.
48 * ====================================================================
49 *
50 * This product includes cryptographic software written by Eric Young
51 * (eay@cryptsoft.com). This product includes software written by Tim
52 * Hudson (tjh@cryptsoft.com).
53 *
54 */
55
56/* NOTE: this file was auto generated by the mkerr.pl script: any changes
57 * made to it will be overwritten when the script next updates this file,
58 * only reason strings will be preserved.
59 */
60
61#ifndef HEADER_CTERR_H
62# define HEADER_CTERR_H
63
64# include <openssl/opensslconf.h>
65
66# ifndef OPENSSL_NO_CT
67
68#ifdef __cplusplus
69extern "C"
70#endif
71
72int ERR_load_CT_strings(void);
73
74/*
75 * CT function codes.
76 */
77# define CT_F_CTLOG_NEW 117
78# define CT_F_CTLOG_NEW_FROM_BASE64 118
79# define CT_F_CTLOG_NEW_FROM_CONF 119
80# define CT_F_CTLOG_STORE_LOAD_CTX_NEW 122
81# define CT_F_CTLOG_STORE_LOAD_FILE 123
82# define CT_F_CTLOG_STORE_LOAD_LOG 130
83# define CT_F_CTLOG_STORE_NEW 131
84# define CT_F_CT_BASE64_DECODE 124
85# define CT_F_CT_POLICY_EVAL_CTX_NEW 133
86# define CT_F_CT_V1_LOG_ID_FROM_PKEY 125
87# define CT_F_I2O_SCT 107
88# define CT_F_I2O_SCT_LIST 108
89# define CT_F_I2O_SCT_SIGNATURE 109
90# define CT_F_O2I_SCT 110
91# define CT_F_O2I_SCT_LIST 111
92# define CT_F_O2I_SCT_SIGNATURE 112
93# define CT_F_SCT_CTX_NEW 126
94# define CT_F_SCT_CTX_VERIFY 128
95# define CT_F_SCT_NEW 100
96# define CT_F_SCT_NEW_FROM_BASE64 127
97# define CT_F_SCT_SET0_LOG_ID 101
98# define CT_F_SCT_SET1_EXTENSIONS 114
99# define CT_F_SCT_SET1_LOG_ID 115
100# define CT_F_SCT_SET1_SIGNATURE 116
101# define CT_F_SCT_SET_LOG_ENTRY_TYPE 102
102# define CT_F_SCT_SET_SIGNATURE_NID 103
103# define CT_F_SCT_SET_VERSION 104
104
105/*
106 * CT reason codes.
107 */
108# define CT_R_BASE64_DECODE_ERROR 108
109# define CT_R_INVALID_LOG_ID_LENGTH 100
110# define CT_R_LOG_CONF_INVALID 109
111# define CT_R_LOG_CONF_INVALID_KEY 110
112# define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
113# define CT_R_LOG_CONF_MISSING_KEY 112
114# define CT_R_LOG_KEY_INVALID 113
115# define CT_R_SCT_FUTURE_TIMESTAMP 116
116# define CT_R_SCT_INVALID 104
117# define CT_R_SCT_INVALID_SIGNATURE 107
118# define CT_R_SCT_LIST_INVALID 105
119# define CT_R_SCT_LOG_ID_MISMATCH 114
120# define CT_R_SCT_NOT_SET 106
121# define CT_R_SCT_UNSUPPORTED_VERSION 115
122# define CT_R_UNRECOGNIZED_SIGNATURE_NID 101
123# define CT_R_UNSUPPORTED_ENTRY_TYPE 102
124# define CT_R_UNSUPPORTED_VERSION 103
125
126# endif
127#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-31 20:21:11 +0000