summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2023-07-08 10:44:00 +0000
committerbeck <>2023-07-08 10:44:00 +0000
commit54e4324e827ac7cd7df64ffc8abbc44b8421b372 (patch)
treeddfc350f4441a2d4dfaa8b6f20f83e6cabdf712e
parent62076bba7c620e3ba9d5e1eb92934c369465834b (diff)
downloadopenbsd-54e4324e827ac7cd7df64ffc8abbc44b8421b372.tar.gz
openbsd-54e4324e827ac7cd7df64ffc8abbc44b8421b372.tar.bz2
openbsd-54e4324e827ac7cd7df64ffc8abbc44b8421b372.zip
Hide symbols in cast, idea, and ocsp
ok tb@
Diffstat
-rw-r--r--src/lib/libcrypto/Symbols.namespace176
-rw-r--r--src/lib/libcrypto/cast/c_cfb64.c3
-rw-r--r--src/lib/libcrypto/cast/c_ecb.c3
-rw-r--r--src/lib/libcrypto/cast/c_enc.c5
-rw-r--r--src/lib/libcrypto/cast/c_ofb64.c3
-rw-r--r--src/lib/libcrypto/cast/c_skey.c4
-rw-r--r--src/lib/libcrypto/hidden/openssl/cast.h36
-rw-r--r--src/lib/libcrypto/hidden/openssl/idea.h37
-rw-r--r--src/lib/libcrypto/hidden/openssl/ocsp.h190
-rw-r--r--src/lib/libcrypto/idea/i_cbc.c4
-rw-r--r--src/lib/libcrypto/idea/i_cfb64.c3
-rw-r--r--src/lib/libcrypto/idea/i_ecb.c4
-rw-r--r--src/lib/libcrypto/idea/i_ofb64.c3
-rw-r--r--src/lib/libcrypto/idea/i_skey.c4
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_asn.c66
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_cl.c21
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_err.c3
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_ext.c46
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_ht.c8
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_lib.c8
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_prn.c7
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_srv.c11
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_vfy.c5
23 files changed, 630 insertions, 20 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 89c4a06367..37063b03be 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -2063,3 +2063,179 @@ _libre_OPENSSL_cpu_caps
2063_libre_OPENSSL_init_crypto 2063_libre_OPENSSL_init_crypto
2064_libre_OPENSSL_cleanup 2064_libre_OPENSSL_cleanup
2065_libre_ERR_load_CRYPTO_strings 2065_libre_ERR_load_CRYPTO_strings
2066_libre_CAST_set_key
2067_libre_CAST_ecb_encrypt
2068_libre_CAST_encrypt
2069_libre_CAST_decrypt
2070_libre_CAST_cbc_encrypt
2071_libre_CAST_cfb64_encrypt
2072_libre_CAST_ofb64_encrypt
2073_libre_idea_options
2074_libre_idea_ecb_encrypt
2075_libre_idea_set_encrypt_key
2076_libre_idea_set_decrypt_key
2077_libre_idea_cbc_encrypt
2078_libre_idea_cfb64_encrypt
2079_libre_idea_ofb64_encrypt
2080_libre_idea_encrypt
2081_libre_OCSP_RESPID_new
2082_libre_OCSP_RESPID_free
2083_libre_d2i_OCSP_RESPID
2084_libre_i2d_OCSP_RESPID
2085_libre_OCSP_CERTID_dup
2086_libre_OCSP_sendreq_bio
2087_libre_OCSP_sendreq_new
2088_libre_OCSP_sendreq_nbio
2089_libre_OCSP_REQ_CTX_free
2090_libre_OCSP_REQ_CTX_set1_req
2091_libre_OCSP_REQ_CTX_add1_header
2092_libre_OCSP_cert_to_id
2093_libre_OCSP_cert_id_new
2094_libre_OCSP_request_add0_id
2095_libre_OCSP_request_add1_nonce
2096_libre_OCSP_basic_add1_nonce
2097_libre_OCSP_check_nonce
2098_libre_OCSP_copy_nonce
2099_libre_OCSP_request_set1_name
2100_libre_OCSP_request_add1_cert
2101_libre_OCSP_request_sign
2102_libre_OCSP_response_status
2103_libre_OCSP_response_get1_basic
2104_libre_OCSP_resp_get0_signature
2105_libre_OCSP_resp_get0_tbs_sigalg
2106_libre_OCSP_resp_get0_respdata
2107_libre_OCSP_resp_get0_signer
2108_libre_OCSP_resp_count
2109_libre_OCSP_resp_get0
2110_libre_OCSP_resp_get0_produced_at
2111_libre_OCSP_resp_get0_certs
2112_libre_OCSP_resp_get0_id
2113_libre_OCSP_resp_find
2114_libre_OCSP_single_get0_status
2115_libre_OCSP_resp_find_status
2116_libre_OCSP_check_validity
2117_libre_OCSP_request_verify
2118_libre_OCSP_parse_url
2119_libre_OCSP_id_issuer_cmp
2120_libre_OCSP_id_cmp
2121_libre_OCSP_request_onereq_count
2122_libre_OCSP_request_onereq_get0
2123_libre_OCSP_onereq_get0_id
2124_libre_OCSP_id_get0_info
2125_libre_OCSP_request_is_signed
2126_libre_OCSP_response_create
2127_libre_OCSP_basic_add1_status
2128_libre_OCSP_basic_add1_cert
2129_libre_OCSP_basic_sign
2130_libre_OCSP_crlID_new
2131_libre_OCSP_accept_responses_new
2132_libre_OCSP_archive_cutoff_new
2133_libre_OCSP_url_svcloc_new
2134_libre_OCSP_REQUEST_get_ext_count
2135_libre_OCSP_REQUEST_get_ext_by_NID
2136_libre_OCSP_REQUEST_get_ext_by_OBJ
2137_libre_OCSP_REQUEST_get_ext_by_critical
2138_libre_OCSP_REQUEST_get_ext
2139_libre_OCSP_REQUEST_delete_ext
2140_libre_OCSP_REQUEST_get1_ext_d2i
2141_libre_OCSP_REQUEST_add1_ext_i2d
2142_libre_OCSP_REQUEST_add_ext
2143_libre_OCSP_ONEREQ_get_ext_count
2144_libre_OCSP_ONEREQ_get_ext_by_NID
2145_libre_OCSP_ONEREQ_get_ext_by_OBJ
2146_libre_OCSP_ONEREQ_get_ext_by_critical
2147_libre_OCSP_ONEREQ_get_ext
2148_libre_OCSP_ONEREQ_delete_ext
2149_libre_OCSP_ONEREQ_get1_ext_d2i
2150_libre_OCSP_ONEREQ_add1_ext_i2d
2151_libre_OCSP_ONEREQ_add_ext
2152_libre_OCSP_BASICRESP_get_ext_count
2153_libre_OCSP_BASICRESP_get_ext_by_NID
2154_libre_OCSP_BASICRESP_get_ext_by_OBJ
2155_libre_OCSP_BASICRESP_get_ext_by_critical
2156_libre_OCSP_BASICRESP_get_ext
2157_libre_OCSP_BASICRESP_delete_ext
2158_libre_OCSP_BASICRESP_get1_ext_d2i
2159_libre_OCSP_BASICRESP_add1_ext_i2d
2160_libre_OCSP_BASICRESP_add_ext
2161_libre_OCSP_SINGLERESP_get_ext_count
2162_libre_OCSP_SINGLERESP_get_ext_by_NID
2163_libre_OCSP_SINGLERESP_get_ext_by_OBJ
2164_libre_OCSP_SINGLERESP_get_ext_by_critical
2165_libre_OCSP_SINGLERESP_get_ext
2166_libre_OCSP_SINGLERESP_delete_ext
2167_libre_OCSP_SINGLERESP_get1_ext_d2i
2168_libre_OCSP_SINGLERESP_add1_ext_i2d
2169_libre_OCSP_SINGLERESP_add_ext
2170_libre_OCSP_SINGLERESP_get0_id
2171_libre_OCSP_SINGLERESP_new
2172_libre_OCSP_SINGLERESP_free
2173_libre_d2i_OCSP_SINGLERESP
2174_libre_i2d_OCSP_SINGLERESP
2175_libre_OCSP_CERTSTATUS_new
2176_libre_OCSP_CERTSTATUS_free
2177_libre_d2i_OCSP_CERTSTATUS
2178_libre_i2d_OCSP_CERTSTATUS
2179_libre_OCSP_REVOKEDINFO_new
2180_libre_OCSP_REVOKEDINFO_free
2181_libre_d2i_OCSP_REVOKEDINFO
2182_libre_i2d_OCSP_REVOKEDINFO
2183_libre_OCSP_BASICRESP_new
2184_libre_OCSP_BASICRESP_free
2185_libre_d2i_OCSP_BASICRESP
2186_libre_i2d_OCSP_BASICRESP
2187_libre_OCSP_RESPDATA_new
2188_libre_OCSP_RESPDATA_free
2189_libre_d2i_OCSP_RESPDATA
2190_libre_i2d_OCSP_RESPDATA
2191_libre_OCSP_RESPID_new
2192_libre_OCSP_RESPID_free
2193_libre_d2i_OCSP_RESPID
2194_libre_i2d_OCSP_RESPID
2195_libre_OCSP_RESPONSE_new
2196_libre_OCSP_RESPONSE_free
2197_libre_d2i_OCSP_RESPONSE
2198_libre_i2d_OCSP_RESPONSE
2199_libre_d2i_OCSP_RESPONSE_bio
2200_libre_i2d_OCSP_RESPONSE_bio
2201_libre_OCSP_RESPBYTES_new
2202_libre_OCSP_RESPBYTES_free
2203_libre_d2i_OCSP_RESPBYTES
2204_libre_i2d_OCSP_RESPBYTES
2205_libre_OCSP_ONEREQ_new
2206_libre_OCSP_ONEREQ_free
2207_libre_d2i_OCSP_ONEREQ
2208_libre_i2d_OCSP_ONEREQ
2209_libre_OCSP_CERTID_new
2210_libre_OCSP_CERTID_free
2211_libre_d2i_OCSP_CERTID
2212_libre_i2d_OCSP_CERTID
2213_libre_OCSP_REQUEST_new
2214_libre_OCSP_REQUEST_free
2215_libre_d2i_OCSP_REQUEST
2216_libre_i2d_OCSP_REQUEST
2217_libre_d2i_OCSP_REQUEST_bio
2218_libre_i2d_OCSP_REQUEST_bio
2219_libre_OCSP_SIGNATURE_new
2220_libre_OCSP_SIGNATURE_free
2221_libre_d2i_OCSP_SIGNATURE
2222_libre_i2d_OCSP_SIGNATURE
2223_libre_OCSP_REQINFO_new
2224_libre_OCSP_REQINFO_free
2225_libre_d2i_OCSP_REQINFO
2226_libre_i2d_OCSP_REQINFO
2227_libre_OCSP_CRLID_new
2228_libre_OCSP_CRLID_free
2229_libre_d2i_OCSP_CRLID
2230_libre_i2d_OCSP_CRLID
2231_libre_OCSP_SERVICELOC_new
2232_libre_OCSP_SERVICELOC_free
2233_libre_d2i_OCSP_SERVICELOC
2234_libre_i2d_OCSP_SERVICELOC
2235_libre_OCSP_response_status_str
2236_libre_OCSP_cert_status_str
2237_libre_OCSP_crl_reason_str
2238_libre_OCSP_REQUEST_print
2239_libre_OCSP_RESPONSE_print
2240_libre_OCSP_basic_verify
2241_libre_ERR_load_OCSP_strings
diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c
index 2b1883b1fb..2acf7632e7 100644
--- a/src/lib/libcrypto/cast/c_cfb64.c
+++ b/src/lib/libcrypto/cast/c_cfb64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_cfb64.c,v 1.7 2023/07/08 07:25:43 jsing Exp $ */ 1/* $OpenBSD: c_cfb64.c,v 1.8 2023/07/08 10:43:59 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 *
@@ -121,3 +121,4 @@ CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
121 v0 = v1 = ti[0] = ti[1] = t=c = cc = 0; 121 v0 = v1 = ti[0] = ti[1] = t=c = cc = 0;
122 *num = n; 122 *num = n;
123} 123}
124LCRYPTO_ALIAS(CAST_cfb64_encrypt);
diff --git a/src/lib/libcrypto/cast/c_ecb.c b/src/lib/libcrypto/cast/c_ecb.c
index ea00898536..89338a18e5 100644
--- a/src/lib/libcrypto/cast/c_ecb.c
+++ b/src/lib/libcrypto/cast/c_ecb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_ecb.c,v 1.9 2023/07/08 07:25:43 jsing Exp $ */ 1/* $OpenBSD: c_ecb.c,v 1.10 2023/07/08 10:43:59 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 *
@@ -80,3 +80,4 @@ CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
80 l2n(l, out); 80 l2n(l, out);
81 l = d[0] = d[1] = 0; 81 l = d[0] = d[1] = 0;
82} 82}
83LCRYPTO_ALIAS(CAST_ecb_encrypt);
diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c
index 70cad75f31..34fe69f0a0 100644
--- a/src/lib/libcrypto/cast/c_enc.c
+++ b/src/lib/libcrypto/cast/c_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_enc.c,v 1.9 2023/07/08 07:25:43 jsing Exp $ */ 1/* $OpenBSD: c_enc.c,v 1.10 2023/07/08 10:43:59 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 *
@@ -92,6 +92,7 @@ CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
92 data[1] = l&0xffffffffL; 92 data[1] = l&0xffffffffL;
93 data[0] = r&0xffffffffL; 93 data[0] = r&0xffffffffL;
94} 94}
95LCRYPTO_ALIAS(CAST_encrypt);
95 96
96void 97void
97CAST_decrypt(CAST_LONG *data, const CAST_KEY *key) 98CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
@@ -125,6 +126,7 @@ CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
125 data[1] = l&0xffffffffL; 126 data[1] = l&0xffffffffL;
126 data[0] = r&0xffffffffL; 127 data[0] = r&0xffffffffL;
127} 128}
129LCRYPTO_ALIAS(CAST_decrypt);
128#endif 130#endif
129 131
130void 132void
@@ -202,3 +204,4 @@ CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
202 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; 204 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
203 tin[0] = tin[1] = 0; 205 tin[0] = tin[1] = 0;
204} 206}
207LCRYPTO_ALIAS(CAST_cbc_encrypt);
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c
index 7fd5444a05..48ebab9069 100644
--- a/src/lib/libcrypto/cast/c_ofb64.c
+++ b/src/lib/libcrypto/cast/c_ofb64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_ofb64.c,v 1.7 2023/07/08 07:25:43 jsing Exp $ */ 1/* $OpenBSD: c_ofb64.c,v 1.8 2023/07/08 10:43:59 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 *
@@ -108,3 +108,4 @@ CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
108 t = v0 = v1 = ti[0] = ti[1] = 0; 108 t = v0 = v1 = ti[0] = ti[1] = 0;
109 *num = n; 109 *num = n;
110} 110}
111LCRYPTO_ALIAS(CAST_ofb64_encrypt);
diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c
index 1f876648fd..ecce7bad7f 100644
--- a/src/lib/libcrypto/cast/c_skey.c
+++ b/src/lib/libcrypto/cast/c_skey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_skey.c,v 1.13 2023/07/08 07:25:43 jsing Exp $ */ 1/* $OpenBSD: c_skey.c,v 1.14 2023/07/08 10:43:59 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 *
@@ -166,4 +166,4 @@ CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
166 key->data[i*2 + 1] = ((k[i + 16]) + 16)&0x1f; 166 key->data[i*2 + 1] = ((k[i + 16]) + 16)&0x1f;
167 } 167 }
168} 168}
169 169LCRYPTO_ALIAS(CAST_set_key);
diff --git a/src/lib/libcrypto/hidden/openssl/cast.h b/src/lib/libcrypto/hidden/openssl/cast.h
new file mode 100644
index 0000000000..68cf618266
--- /dev/null
+++ b/src/lib/libcrypto/hidden/openssl/cast.h
@@ -0,0 +1,36 @@
1/* $OpenBSD: cast.h,v 1.1 2023/07/08 10:44:00 beck Exp $ */
2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBCRYPTO_CAST_H
19#define _LIBCRYPTO_CAST_H
20
21#ifndef _MSC_VER
22#include_next <openssl/cast.h>
23#else
24#include "../include/openssl/cast.h"
25#endif
26#include "crypto_namespace.h"
27
28LCRYPTO_USED(CAST_set_key);
29LCRYPTO_USED(CAST_ecb_encrypt);
30LCRYPTO_USED(CAST_encrypt);
31LCRYPTO_USED(CAST_decrypt);
32LCRYPTO_USED(CAST_cbc_encrypt);
33LCRYPTO_USED(CAST_cfb64_encrypt);
34LCRYPTO_USED(CAST_ofb64_encrypt);
35
36#endif /* _LIBCRYPTO_CAST_H */
diff --git a/src/lib/libcrypto/hidden/openssl/idea.h b/src/lib/libcrypto/hidden/openssl/idea.h
new file mode 100644
index 0000000000..f8c7caf6a3
--- /dev/null
+++ b/src/lib/libcrypto/hidden/openssl/idea.h
@@ -0,0 +1,37 @@
1/* $OpenBSD: idea.h,v 1.1 2023/07/08 10:44:00 beck Exp $ */
2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBCRYPTO_IDEA_H
19#define _LIBCRYPTO_IDEA_H
20
21#ifndef _MSC_VER
22#include_next <openssl/idea.h>
23#else
24#include "../include/openssl/idea.h"
25#endif
26#include "crypto_namespace.h"
27
28LCRYPTO_USED(idea_options);
29LCRYPTO_USED(idea_ecb_encrypt);
30LCRYPTO_USED(idea_set_encrypt_key);
31LCRYPTO_USED(idea_set_decrypt_key);
32LCRYPTO_USED(idea_cbc_encrypt);
33LCRYPTO_USED(idea_cfb64_encrypt);
34LCRYPTO_USED(idea_ofb64_encrypt);
35LCRYPTO_USED(idea_encrypt);
36
37#endif /* _LIBCRYPTO_IDEA_H */
diff --git a/src/lib/libcrypto/hidden/openssl/ocsp.h b/src/lib/libcrypto/hidden/openssl/ocsp.h
new file mode 100644
index 0000000000..654696224f
--- /dev/null
+++ b/src/lib/libcrypto/hidden/openssl/ocsp.h
@@ -0,0 +1,190 @@
1/* $OpenBSD: ocsp.h,v 1.1 2023/07/08 10:44:00 beck Exp $ */
2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBCRYPTO_OCSP_H
19#define _LIBCRYPTO_OCSP_H
20
21#ifndef _MSC_VER
22#include_next <openssl/ocsp.h>
23#else
24#include "../include/openssl/ocsp.h"
25#endif
26#include "crypto_namespace.h"
27
28LCRYPTO_USED(OCSP_RESPID_new);
29LCRYPTO_USED(OCSP_RESPID_free);
30LCRYPTO_USED(d2i_OCSP_RESPID);
31LCRYPTO_USED(i2d_OCSP_RESPID);
32LCRYPTO_USED(OCSP_CERTID_dup);
33LCRYPTO_USED(OCSP_sendreq_bio);
34LCRYPTO_USED(OCSP_sendreq_new);
35LCRYPTO_USED(OCSP_sendreq_nbio);
36LCRYPTO_USED(OCSP_REQ_CTX_free);
37LCRYPTO_USED(OCSP_REQ_CTX_set1_req);
38LCRYPTO_USED(OCSP_REQ_CTX_add1_header);
39LCRYPTO_USED(OCSP_cert_to_id);
40LCRYPTO_USED(OCSP_cert_id_new);
41LCRYPTO_USED(OCSP_request_add0_id);
42LCRYPTO_USED(OCSP_request_add1_nonce);
43LCRYPTO_USED(OCSP_basic_add1_nonce);
44LCRYPTO_USED(OCSP_check_nonce);
45LCRYPTO_USED(OCSP_copy_nonce);
46LCRYPTO_USED(OCSP_request_set1_name);
47LCRYPTO_USED(OCSP_request_add1_cert);
48LCRYPTO_USED(OCSP_request_sign);
49LCRYPTO_USED(OCSP_response_status);
50LCRYPTO_USED(OCSP_response_get1_basic);
51LCRYPTO_USED(OCSP_resp_get0_signature);
52LCRYPTO_USED(OCSP_resp_get0_tbs_sigalg);
53LCRYPTO_USED(OCSP_resp_get0_respdata);
54LCRYPTO_USED(OCSP_resp_get0_signer);
55LCRYPTO_USED(OCSP_resp_count);
56LCRYPTO_USED(OCSP_resp_get0);
57LCRYPTO_USED(OCSP_resp_get0_produced_at);
58LCRYPTO_USED(OCSP_resp_get0_certs);
59LCRYPTO_USED(OCSP_resp_get0_id);
60LCRYPTO_USED(OCSP_resp_find);
61LCRYPTO_USED(OCSP_single_get0_status);
62LCRYPTO_USED(OCSP_resp_find_status);
63LCRYPTO_USED(OCSP_check_validity);
64LCRYPTO_USED(OCSP_request_verify);
65LCRYPTO_USED(OCSP_parse_url);
66LCRYPTO_USED(OCSP_id_issuer_cmp);
67LCRYPTO_USED(OCSP_id_cmp);
68LCRYPTO_USED(OCSP_request_onereq_count);
69LCRYPTO_USED(OCSP_request_onereq_get0);
70LCRYPTO_USED(OCSP_onereq_get0_id);
71LCRYPTO_USED(OCSP_id_get0_info);
72LCRYPTO_USED(OCSP_request_is_signed);
73LCRYPTO_USED(OCSP_response_create);
74LCRYPTO_USED(OCSP_basic_add1_status);
75LCRYPTO_USED(OCSP_basic_add1_cert);
76LCRYPTO_USED(OCSP_basic_sign);
77LCRYPTO_USED(OCSP_crlID_new);
78LCRYPTO_USED(OCSP_accept_responses_new);
79LCRYPTO_USED(OCSP_archive_cutoff_new);
80LCRYPTO_USED(OCSP_url_svcloc_new);
81LCRYPTO_USED(OCSP_REQUEST_get_ext_count);
82LCRYPTO_USED(OCSP_REQUEST_get_ext_by_NID);
83LCRYPTO_USED(OCSP_REQUEST_get_ext_by_OBJ);
84LCRYPTO_USED(OCSP_REQUEST_get_ext_by_critical);
85LCRYPTO_USED(OCSP_REQUEST_get_ext);
86LCRYPTO_USED(OCSP_REQUEST_delete_ext);
87LCRYPTO_USED(OCSP_REQUEST_get1_ext_d2i);
88LCRYPTO_USED(OCSP_REQUEST_add1_ext_i2d);
89LCRYPTO_USED(OCSP_REQUEST_add_ext);
90LCRYPTO_USED(OCSP_ONEREQ_get_ext_count);
91LCRYPTO_USED(OCSP_ONEREQ_get_ext_by_NID);
92LCRYPTO_USED(OCSP_ONEREQ_get_ext_by_OBJ);
93LCRYPTO_USED(OCSP_ONEREQ_get_ext_by_critical);
94LCRYPTO_USED(OCSP_ONEREQ_get_ext);
95LCRYPTO_USED(OCSP_ONEREQ_delete_ext);
96LCRYPTO_USED(OCSP_ONEREQ_get1_ext_d2i);
97LCRYPTO_USED(OCSP_ONEREQ_add1_ext_i2d);
98LCRYPTO_USED(OCSP_ONEREQ_add_ext);
99LCRYPTO_USED(OCSP_BASICRESP_get_ext_count);
100LCRYPTO_USED(OCSP_BASICRESP_get_ext_by_NID);
101LCRYPTO_USED(OCSP_BASICRESP_get_ext_by_OBJ);
102LCRYPTO_USED(OCSP_BASICRESP_get_ext_by_critical);
103LCRYPTO_USED(OCSP_BASICRESP_get_ext);
104LCRYPTO_USED(OCSP_BASICRESP_delete_ext);
105LCRYPTO_USED(OCSP_BASICRESP_get1_ext_d2i);
106LCRYPTO_USED(OCSP_BASICRESP_add1_ext_i2d);
107LCRYPTO_USED(OCSP_BASICRESP_add_ext);
108LCRYPTO_USED(OCSP_SINGLERESP_get_ext_count);
109LCRYPTO_USED(OCSP_SINGLERESP_get_ext_by_NID);
110LCRYPTO_USED(OCSP_SINGLERESP_get_ext_by_OBJ);
111LCRYPTO_USED(OCSP_SINGLERESP_get_ext_by_critical);
112LCRYPTO_USED(OCSP_SINGLERESP_get_ext);
113LCRYPTO_USED(OCSP_SINGLERESP_delete_ext);
114LCRYPTO_USED(OCSP_SINGLERESP_get1_ext_d2i);
115LCRYPTO_USED(OCSP_SINGLERESP_add1_ext_i2d);
116LCRYPTO_USED(OCSP_SINGLERESP_add_ext);
117LCRYPTO_USED(OCSP_SINGLERESP_get0_id);
118LCRYPTO_USED(OCSP_SINGLERESP_new);
119LCRYPTO_USED(OCSP_SINGLERESP_free);
120LCRYPTO_USED(d2i_OCSP_SINGLERESP);
121LCRYPTO_USED(i2d_OCSP_SINGLERESP);
122LCRYPTO_USED(OCSP_CERTSTATUS_new);
123LCRYPTO_USED(OCSP_CERTSTATUS_free);
124LCRYPTO_USED(d2i_OCSP_CERTSTATUS);
125LCRYPTO_USED(i2d_OCSP_CERTSTATUS);
126LCRYPTO_USED(OCSP_REVOKEDINFO_new);
127LCRYPTO_USED(OCSP_REVOKEDINFO_free);
128LCRYPTO_USED(d2i_OCSP_REVOKEDINFO);
129LCRYPTO_USED(i2d_OCSP_REVOKEDINFO);
130LCRYPTO_USED(OCSP_BASICRESP_new);
131LCRYPTO_USED(OCSP_BASICRESP_free);
132LCRYPTO_USED(d2i_OCSP_BASICRESP);
133LCRYPTO_USED(i2d_OCSP_BASICRESP);
134LCRYPTO_USED(OCSP_RESPDATA_new);
135LCRYPTO_USED(OCSP_RESPDATA_free);
136LCRYPTO_USED(d2i_OCSP_RESPDATA);
137LCRYPTO_USED(i2d_OCSP_RESPDATA);
138LCRYPTO_USED(OCSP_RESPID_new);
139LCRYPTO_USED(OCSP_RESPID_free);
140LCRYPTO_USED(d2i_OCSP_RESPID);
141LCRYPTO_USED(i2d_OCSP_RESPID);
142LCRYPTO_USED(OCSP_RESPONSE_new);
143LCRYPTO_USED(OCSP_RESPONSE_free);
144LCRYPTO_USED(d2i_OCSP_RESPONSE);
145LCRYPTO_USED(i2d_OCSP_RESPONSE);
146LCRYPTO_USED(d2i_OCSP_RESPONSE_bio);
147LCRYPTO_USED(i2d_OCSP_RESPONSE_bio);
148LCRYPTO_USED(OCSP_RESPBYTES_new);
149LCRYPTO_USED(OCSP_RESPBYTES_free);
150LCRYPTO_USED(d2i_OCSP_RESPBYTES);
151LCRYPTO_USED(i2d_OCSP_RESPBYTES);
152LCRYPTO_USED(OCSP_ONEREQ_new);
153LCRYPTO_USED(OCSP_ONEREQ_free);
154LCRYPTO_USED(d2i_OCSP_ONEREQ);
155LCRYPTO_USED(i2d_OCSP_ONEREQ);
156LCRYPTO_USED(OCSP_CERTID_new);
157LCRYPTO_USED(OCSP_CERTID_free);
158LCRYPTO_USED(d2i_OCSP_CERTID);
159LCRYPTO_USED(i2d_OCSP_CERTID);
160LCRYPTO_USED(OCSP_REQUEST_new);
161LCRYPTO_USED(OCSP_REQUEST_free);
162LCRYPTO_USED(d2i_OCSP_REQUEST);
163LCRYPTO_USED(i2d_OCSP_REQUEST);
164LCRYPTO_USED(d2i_OCSP_REQUEST_bio);
165LCRYPTO_USED(i2d_OCSP_REQUEST_bio);
166LCRYPTO_USED(OCSP_SIGNATURE_new);
167LCRYPTO_USED(OCSP_SIGNATURE_free);
168LCRYPTO_USED(d2i_OCSP_SIGNATURE);
169LCRYPTO_USED(i2d_OCSP_SIGNATURE);
170LCRYPTO_USED(OCSP_REQINFO_new);
171LCRYPTO_USED(OCSP_REQINFO_free);
172LCRYPTO_USED(d2i_OCSP_REQINFO);
173LCRYPTO_USED(i2d_OCSP_REQINFO);
174LCRYPTO_USED(OCSP_CRLID_new);
175LCRYPTO_USED(OCSP_CRLID_free);
176LCRYPTO_USED(d2i_OCSP_CRLID);
177LCRYPTO_USED(i2d_OCSP_CRLID);
178LCRYPTO_USED(OCSP_SERVICELOC_new);
179LCRYPTO_USED(OCSP_SERVICELOC_free);
180LCRYPTO_USED(d2i_OCSP_SERVICELOC);
181LCRYPTO_USED(i2d_OCSP_SERVICELOC);
182LCRYPTO_USED(OCSP_response_status_str);
183LCRYPTO_USED(OCSP_cert_status_str);
184LCRYPTO_USED(OCSP_crl_reason_str);
185LCRYPTO_USED(OCSP_REQUEST_print);
186LCRYPTO_USED(OCSP_RESPONSE_print);
187LCRYPTO_USED(OCSP_basic_verify);
188LCRYPTO_USED(ERR_load_OCSP_strings);
189
190#endif /* _LIBCRYPTO_OCSP_H */
diff --git a/src/lib/libcrypto/idea/i_cbc.c b/src/lib/libcrypto/idea/i_cbc.c
index a9de41d647..d75134063c 100644
--- a/src/lib/libcrypto/idea/i_cbc.c
+++ b/src/lib/libcrypto/idea/i_cbc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: i_cbc.c,v 1.5 2023/07/07 12:51:58 beck Exp $ */ 1/* $OpenBSD: i_cbc.c,v 1.6 2023/07/08 10:44:00 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 *
@@ -136,6 +136,7 @@ idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
136 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; 136 tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
137 tin[0] = tin[1] = 0; 137 tin[0] = tin[1] = 0;
138} 138}
139LCRYPTO_ALIAS(idea_cbc_encrypt);
139 140
140void 141void
141idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key) 142idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
@@ -172,3 +173,4 @@ idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
172 d[0] = (t0 & 0xffff)|((x1 & 0xffff) << 16); 173 d[0] = (t0 & 0xffff)|((x1 & 0xffff) << 16);
173 d[1] = (x4 & 0xffff)|((t1 & 0xffff) << 16); 174 d[1] = (x4 & 0xffff)|((t1 & 0xffff) << 16);
174} 175}
176LCRYPTO_ALIAS(idea_encrypt);
diff --git a/src/lib/libcrypto/idea/i_cfb64.c b/src/lib/libcrypto/idea/i_cfb64.c
index f284684502..a1a543f619 100644
--- a/src/lib/libcrypto/idea/i_cfb64.c
+++ b/src/lib/libcrypto/idea/i_cfb64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: i_cfb64.c,v 1.5 2023/07/07 12:51:58 beck Exp $ */ 1/* $OpenBSD: i_cfb64.c,v 1.6 2023/07/08 10:44:00 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 *
@@ -121,3 +121,4 @@ idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
121 v0 = v1 = ti[0] = ti[1] = t = c = cc = 0; 121 v0 = v1 = ti[0] = ti[1] = t = c = cc = 0;
122 *num = n; 122 *num = n;
123} 123}
124LCRYPTO_ALIAS(idea_cfb64_encrypt);
diff --git a/src/lib/libcrypto/idea/i_ecb.c b/src/lib/libcrypto/idea/i_ecb.c
index ce67edba66..19521a7536 100644
--- a/src/lib/libcrypto/idea/i_ecb.c
+++ b/src/lib/libcrypto/idea/i_ecb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: i_ecb.c,v 1.5 2023/07/07 12:51:58 beck Exp $ */ 1/* $OpenBSD: i_ecb.c,v 1.6 2023/07/08 10:44:00 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 *
@@ -68,6 +68,7 @@ idea_options(void)
68 else 68 else
69 return ("idea(short)"); 69 return ("idea(short)");
70} 70}
71LCRYPTO_ALIAS(idea_options);
71 72
72void 73void
73idea_ecb_encrypt(const unsigned char *in, unsigned char *out, 74idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
@@ -86,3 +87,4 @@ idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
86 l2n(l1, out); 87 l2n(l1, out);
87 l0 = l1 = d[0] = d[1] = 0; 88 l0 = l1 = d[0] = d[1] = 0;
88} 89}
90LCRYPTO_ALIAS(idea_ecb_encrypt);
diff --git a/src/lib/libcrypto/idea/i_ofb64.c b/src/lib/libcrypto/idea/i_ofb64.c
index 27d85e5a37..5af394ef70 100644
--- a/src/lib/libcrypto/idea/i_ofb64.c
+++ b/src/lib/libcrypto/idea/i_ofb64.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: i_ofb64.c,v 1.5 2023/07/07 12:51:58 beck Exp $ */ 1/* $OpenBSD: i_ofb64.c,v 1.6 2023/07/08 10:44:00 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 *
@@ -108,3 +108,4 @@ idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
108 t = v0 = v1 = ti[0] = ti[1] = 0; 108 t = v0 = v1 = ti[0] = ti[1] = 0;
109 *num = n; 109 *num = n;
110} 110}
111LCRYPTO_ALIAS(idea_ofb64_encrypt);
diff --git a/src/lib/libcrypto/idea/i_skey.c b/src/lib/libcrypto/idea/i_skey.c
index 481c50ba55..ad349bba57 100644
--- a/src/lib/libcrypto/idea/i_skey.c
+++ b/src/lib/libcrypto/idea/i_skey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: i_skey.c,v 1.6 2023/07/07 12:51:58 beck Exp $ */ 1/* $OpenBSD: i_skey.c,v 1.7 2023/07/08 10:44:00 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 *
@@ -102,6 +102,7 @@ idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
102 kf += 8; 102 kf += 8;
103 } 103 }
104} 104}
105LCRYPTO_ALIAS(idea_set_encrypt_key);
105 106
106void 107void
107idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk) 108idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
@@ -133,6 +134,7 @@ idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
133 tp[49] = tp[50]; 134 tp[49] = tp[50];
134 tp[50] = t; 135 tp[50] = t;
135} 136}
137LCRYPTO_ALIAS(idea_set_decrypt_key);
136 138
137/* taken directly from the 'paper' I'll have a look at it later */ 139/* taken directly from the 'paper' I'll have a look at it later */
138static IDEA_INT 140static IDEA_INT
diff --git a/src/lib/libcrypto/ocsp/ocsp_asn.c b/src/lib/libcrypto/ocsp/ocsp_asn.c
index 3f00fca105..4fbdd5fd7f 100644
--- a/src/lib/libcrypto/ocsp/ocsp_asn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_asn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_asn.c,v 1.10 2022/01/07 09:45:52 tb Exp $ */ 1/* $OpenBSD: ocsp_asn.c,v 1.11 2023/07/08 10:44:00 beck 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 2000. 3 * project 2000.
4 */ 4 */
@@ -102,24 +102,28 @@ d2i_OCSP_SIGNATURE(OCSP_SIGNATURE **a, const unsigned char **in, long len)
102 return (OCSP_SIGNATURE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 102 return (OCSP_SIGNATURE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
103 &OCSP_SIGNATURE_it); 103 &OCSP_SIGNATURE_it);
104} 104}
105LCRYPTO_ALIAS(d2i_OCSP_SIGNATURE);
105 106
106int 107int
107i2d_OCSP_SIGNATURE(OCSP_SIGNATURE *a, unsigned char **out) 108i2d_OCSP_SIGNATURE(OCSP_SIGNATURE *a, unsigned char **out)
108{ 109{
109 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SIGNATURE_it); 110 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SIGNATURE_it);
110} 111}
112LCRYPTO_ALIAS(i2d_OCSP_SIGNATURE);
111 113
112OCSP_SIGNATURE * 114OCSP_SIGNATURE *
113OCSP_SIGNATURE_new(void) 115OCSP_SIGNATURE_new(void)
114{ 116{
115 return (OCSP_SIGNATURE *)ASN1_item_new(&OCSP_SIGNATURE_it); 117 return (OCSP_SIGNATURE *)ASN1_item_new(&OCSP_SIGNATURE_it);
116} 118}
119LCRYPTO_ALIAS(OCSP_SIGNATURE_new);
117 120
118void 121void
119OCSP_SIGNATURE_free(OCSP_SIGNATURE *a) 122OCSP_SIGNATURE_free(OCSP_SIGNATURE *a)
120{ 123{
121 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SIGNATURE_it); 124 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SIGNATURE_it);
122} 125}
126LCRYPTO_ALIAS(OCSP_SIGNATURE_free);
123 127
124static const ASN1_TEMPLATE OCSP_CERTID_seq_tt[] = { 128static const ASN1_TEMPLATE OCSP_CERTID_seq_tt[] = {
125 { 129 {
@@ -169,24 +173,28 @@ d2i_OCSP_CERTID(OCSP_CERTID **a, const unsigned char **in, long len)
169 return (OCSP_CERTID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 173 return (OCSP_CERTID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
170 &OCSP_CERTID_it); 174 &OCSP_CERTID_it);
171} 175}
176LCRYPTO_ALIAS(d2i_OCSP_CERTID);
172 177
173int 178int
174i2d_OCSP_CERTID(OCSP_CERTID *a, unsigned char **out) 179i2d_OCSP_CERTID(OCSP_CERTID *a, unsigned char **out)
175{ 180{
176 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CERTID_it); 181 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CERTID_it);
177} 182}
183LCRYPTO_ALIAS(i2d_OCSP_CERTID);
178 184
179OCSP_CERTID * 185OCSP_CERTID *
180OCSP_CERTID_new(void) 186OCSP_CERTID_new(void)
181{ 187{
182 return (OCSP_CERTID *)ASN1_item_new(&OCSP_CERTID_it); 188 return (OCSP_CERTID *)ASN1_item_new(&OCSP_CERTID_it);
183} 189}
190LCRYPTO_ALIAS(OCSP_CERTID_new);
184 191
185void 192void
186OCSP_CERTID_free(OCSP_CERTID *a) 193OCSP_CERTID_free(OCSP_CERTID *a)
187{ 194{
188 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CERTID_it); 195 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CERTID_it);
189} 196}
197LCRYPTO_ALIAS(OCSP_CERTID_free);
190 198
191static const ASN1_TEMPLATE OCSP_ONEREQ_seq_tt[] = { 199static const ASN1_TEMPLATE OCSP_ONEREQ_seq_tt[] = {
192 { 200 {
@@ -222,24 +230,28 @@ d2i_OCSP_ONEREQ(OCSP_ONEREQ **a, const unsigned char **in, long len)
222 return (OCSP_ONEREQ *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 230 return (OCSP_ONEREQ *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
223 &OCSP_ONEREQ_it); 231 &OCSP_ONEREQ_it);
224} 232}
233LCRYPTO_ALIAS(d2i_OCSP_ONEREQ);
225 234
226int 235int
227i2d_OCSP_ONEREQ(OCSP_ONEREQ *a, unsigned char **out) 236i2d_OCSP_ONEREQ(OCSP_ONEREQ *a, unsigned char **out)
228{ 237{
229 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_ONEREQ_it); 238 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_ONEREQ_it);
230} 239}
240LCRYPTO_ALIAS(i2d_OCSP_ONEREQ);
231 241
232OCSP_ONEREQ * 242OCSP_ONEREQ *
233OCSP_ONEREQ_new(void) 243OCSP_ONEREQ_new(void)
234{ 244{
235 return (OCSP_ONEREQ *)ASN1_item_new(&OCSP_ONEREQ_it); 245 return (OCSP_ONEREQ *)ASN1_item_new(&OCSP_ONEREQ_it);
236} 246}
247LCRYPTO_ALIAS(OCSP_ONEREQ_new);
237 248
238void 249void
239OCSP_ONEREQ_free(OCSP_ONEREQ *a) 250OCSP_ONEREQ_free(OCSP_ONEREQ *a)
240{ 251{
241 ASN1_item_free((ASN1_VALUE *)a, &OCSP_ONEREQ_it); 252 ASN1_item_free((ASN1_VALUE *)a, &OCSP_ONEREQ_it);
242} 253}
254LCRYPTO_ALIAS(OCSP_ONEREQ_free);
243 255
244static const ASN1_TEMPLATE OCSP_REQINFO_seq_tt[] = { 256static const ASN1_TEMPLATE OCSP_REQINFO_seq_tt[] = {
245 { 257 {
@@ -289,24 +301,28 @@ d2i_OCSP_REQINFO(OCSP_REQINFO **a, const unsigned char **in, long len)
289 return (OCSP_REQINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 301 return (OCSP_REQINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
290 &OCSP_REQINFO_it); 302 &OCSP_REQINFO_it);
291} 303}
304LCRYPTO_ALIAS(d2i_OCSP_REQINFO);
292 305
293int 306int
294i2d_OCSP_REQINFO(OCSP_REQINFO *a, unsigned char **out) 307i2d_OCSP_REQINFO(OCSP_REQINFO *a, unsigned char **out)
295{ 308{
296 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REQINFO_it); 309 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REQINFO_it);
297} 310}
311LCRYPTO_ALIAS(i2d_OCSP_REQINFO);
298 312
299OCSP_REQINFO * 313OCSP_REQINFO *
300OCSP_REQINFO_new(void) 314OCSP_REQINFO_new(void)
301{ 315{
302 return (OCSP_REQINFO *)ASN1_item_new(&OCSP_REQINFO_it); 316 return (OCSP_REQINFO *)ASN1_item_new(&OCSP_REQINFO_it);
303} 317}
318LCRYPTO_ALIAS(OCSP_REQINFO_new);
304 319
305void 320void
306OCSP_REQINFO_free(OCSP_REQINFO *a) 321OCSP_REQINFO_free(OCSP_REQINFO *a)
307{ 322{
308 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REQINFO_it); 323 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REQINFO_it);
309} 324}
325LCRYPTO_ALIAS(OCSP_REQINFO_free);
310 326
311static const ASN1_TEMPLATE OCSP_REQUEST_seq_tt[] = { 327static const ASN1_TEMPLATE OCSP_REQUEST_seq_tt[] = {
312 { 328 {
@@ -341,36 +357,42 @@ d2i_OCSP_REQUEST(OCSP_REQUEST **a, const unsigned char **in, long len)
341 return (OCSP_REQUEST *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 357 return (OCSP_REQUEST *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
342 &OCSP_REQUEST_it); 358 &OCSP_REQUEST_it);
343} 359}
360LCRYPTO_ALIAS(d2i_OCSP_REQUEST);
344 361
345int 362int
346i2d_OCSP_REQUEST(OCSP_REQUEST *a, unsigned char **out) 363i2d_OCSP_REQUEST(OCSP_REQUEST *a, unsigned char **out)
347{ 364{
348 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REQUEST_it); 365 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REQUEST_it);
349} 366}
367LCRYPTO_ALIAS(i2d_OCSP_REQUEST);
350 368
351OCSP_REQUEST * 369OCSP_REQUEST *
352d2i_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST **a) 370d2i_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST **a)
353{ 371{
354 return ASN1_item_d2i_bio(&OCSP_REQUEST_it, bp, a); 372 return ASN1_item_d2i_bio(&OCSP_REQUEST_it, bp, a);
355} 373}
374LCRYPTO_ALIAS(d2i_OCSP_REQUEST_bio);
356 375
357int 376int
358i2d_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST *a) 377i2d_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST *a)
359{ 378{
360 return ASN1_item_i2d_bio(&OCSP_REQUEST_it, bp, a); 379 return ASN1_item_i2d_bio(&OCSP_REQUEST_it, bp, a);
361} 380}
381LCRYPTO_ALIAS(i2d_OCSP_REQUEST_bio);
362 382
363OCSP_REQUEST * 383OCSP_REQUEST *
364OCSP_REQUEST_new(void) 384OCSP_REQUEST_new(void)
365{ 385{
366 return (OCSP_REQUEST *)ASN1_item_new(&OCSP_REQUEST_it); 386 return (OCSP_REQUEST *)ASN1_item_new(&OCSP_REQUEST_it);
367} 387}
388LCRYPTO_ALIAS(OCSP_REQUEST_new);
368 389
369void 390void
370OCSP_REQUEST_free(OCSP_REQUEST *a) 391OCSP_REQUEST_free(OCSP_REQUEST *a)
371{ 392{
372 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REQUEST_it); 393 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REQUEST_it);
373} 394}
395LCRYPTO_ALIAS(OCSP_REQUEST_free);
374 396
375/* OCSP_RESPONSE templates */ 397/* OCSP_RESPONSE templates */
376 398
@@ -408,24 +430,28 @@ d2i_OCSP_RESPBYTES(OCSP_RESPBYTES **a, const unsigned char **in, long len)
408 return (OCSP_RESPBYTES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 430 return (OCSP_RESPBYTES *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
409 &OCSP_RESPBYTES_it); 431 &OCSP_RESPBYTES_it);
410} 432}
433LCRYPTO_ALIAS(d2i_OCSP_RESPBYTES);
411 434
412int 435int
413i2d_OCSP_RESPBYTES(OCSP_RESPBYTES *a, unsigned char **out) 436i2d_OCSP_RESPBYTES(OCSP_RESPBYTES *a, unsigned char **out)
414{ 437{
415 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPBYTES_it); 438 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPBYTES_it);
416} 439}
440LCRYPTO_ALIAS(i2d_OCSP_RESPBYTES);
417 441
418OCSP_RESPBYTES * 442OCSP_RESPBYTES *
419OCSP_RESPBYTES_new(void) 443OCSP_RESPBYTES_new(void)
420{ 444{
421 return (OCSP_RESPBYTES *)ASN1_item_new(&OCSP_RESPBYTES_it); 445 return (OCSP_RESPBYTES *)ASN1_item_new(&OCSP_RESPBYTES_it);
422} 446}
447LCRYPTO_ALIAS(OCSP_RESPBYTES_new);
423 448
424void 449void
425OCSP_RESPBYTES_free(OCSP_RESPBYTES *a) 450OCSP_RESPBYTES_free(OCSP_RESPBYTES *a)
426{ 451{
427 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPBYTES_it); 452 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPBYTES_it);
428} 453}
454LCRYPTO_ALIAS(OCSP_RESPBYTES_free);
429 455
430static const ASN1_TEMPLATE OCSP_RESPONSE_seq_tt[] = { 456static const ASN1_TEMPLATE OCSP_RESPONSE_seq_tt[] = {
431 { 457 {
@@ -461,36 +487,42 @@ d2i_OCSP_RESPONSE(OCSP_RESPONSE **a, const unsigned char **in, long len)
461 return (OCSP_RESPONSE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 487 return (OCSP_RESPONSE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
462 &OCSP_RESPONSE_it); 488 &OCSP_RESPONSE_it);
463} 489}
490LCRYPTO_ALIAS(d2i_OCSP_RESPONSE);
464 491
465int 492int
466i2d_OCSP_RESPONSE(OCSP_RESPONSE *a, unsigned char **out) 493i2d_OCSP_RESPONSE(OCSP_RESPONSE *a, unsigned char **out)
467{ 494{
468 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPONSE_it); 495 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPONSE_it);
469} 496}
497LCRYPTO_ALIAS(i2d_OCSP_RESPONSE);
470 498
471OCSP_RESPONSE * 499OCSP_RESPONSE *
472d2i_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE **a) 500d2i_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE **a)
473{ 501{
474 return ASN1_item_d2i_bio(&OCSP_RESPONSE_it, bp, a); 502 return ASN1_item_d2i_bio(&OCSP_RESPONSE_it, bp, a);
475} 503}
504LCRYPTO_ALIAS(d2i_OCSP_RESPONSE_bio);
476 505
477int 506int
478i2d_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE *a) 507i2d_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE *a)
479{ 508{
480 return ASN1_item_i2d_bio(&OCSP_RESPONSE_it, bp, a); 509 return ASN1_item_i2d_bio(&OCSP_RESPONSE_it, bp, a);
481} 510}
511LCRYPTO_ALIAS(i2d_OCSP_RESPONSE_bio);
482 512
483OCSP_RESPONSE * 513OCSP_RESPONSE *
484OCSP_RESPONSE_new(void) 514OCSP_RESPONSE_new(void)
485{ 515{
486 return (OCSP_RESPONSE *)ASN1_item_new(&OCSP_RESPONSE_it); 516 return (OCSP_RESPONSE *)ASN1_item_new(&OCSP_RESPONSE_it);
487} 517}
518LCRYPTO_ALIAS(OCSP_RESPONSE_new);
488 519
489void 520void
490OCSP_RESPONSE_free(OCSP_RESPONSE *a) 521OCSP_RESPONSE_free(OCSP_RESPONSE *a)
491{ 522{
492 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPONSE_it); 523 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPONSE_it);
493} 524}
525LCRYPTO_ALIAS(OCSP_RESPONSE_free);
494 526
495static const ASN1_TEMPLATE OCSP_RESPID_ch_tt[] = { 527static const ASN1_TEMPLATE OCSP_RESPID_ch_tt[] = {
496 { 528 {
@@ -526,24 +558,28 @@ d2i_OCSP_RESPID(OCSP_RESPID **a, const unsigned char **in, long len)
526 return (OCSP_RESPID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 558 return (OCSP_RESPID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
527 &OCSP_RESPID_it); 559 &OCSP_RESPID_it);
528} 560}
561LCRYPTO_ALIAS(d2i_OCSP_RESPID);
529 562
530int 563int
531i2d_OCSP_RESPID(OCSP_RESPID *a, unsigned char **out) 564i2d_OCSP_RESPID(OCSP_RESPID *a, unsigned char **out)
532{ 565{
533 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPID_it); 566 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPID_it);
534} 567}
568LCRYPTO_ALIAS(i2d_OCSP_RESPID);
535 569
536OCSP_RESPID * 570OCSP_RESPID *
537OCSP_RESPID_new(void) 571OCSP_RESPID_new(void)
538{ 572{
539 return (OCSP_RESPID *)ASN1_item_new(&OCSP_RESPID_it); 573 return (OCSP_RESPID *)ASN1_item_new(&OCSP_RESPID_it);
540} 574}
575LCRYPTO_ALIAS(OCSP_RESPID_new);
541 576
542void 577void
543OCSP_RESPID_free(OCSP_RESPID *a) 578OCSP_RESPID_free(OCSP_RESPID *a)
544{ 579{
545 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPID_it); 580 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPID_it);
546} 581}
582LCRYPTO_ALIAS(OCSP_RESPID_free);
547 583
548static const ASN1_TEMPLATE OCSP_REVOKEDINFO_seq_tt[] = { 584static const ASN1_TEMPLATE OCSP_REVOKEDINFO_seq_tt[] = {
549 { 585 {
@@ -579,24 +615,28 @@ d2i_OCSP_REVOKEDINFO(OCSP_REVOKEDINFO **a, const unsigned char **in, long len)
579 return (OCSP_REVOKEDINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 615 return (OCSP_REVOKEDINFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
580 &OCSP_REVOKEDINFO_it); 616 &OCSP_REVOKEDINFO_it);
581} 617}
618LCRYPTO_ALIAS(d2i_OCSP_REVOKEDINFO);
582 619
583int 620int
584i2d_OCSP_REVOKEDINFO(OCSP_REVOKEDINFO *a, unsigned char **out) 621i2d_OCSP_REVOKEDINFO(OCSP_REVOKEDINFO *a, unsigned char **out)
585{ 622{
586 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REVOKEDINFO_it); 623 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_REVOKEDINFO_it);
587} 624}
625LCRYPTO_ALIAS(i2d_OCSP_REVOKEDINFO);
588 626
589OCSP_REVOKEDINFO * 627OCSP_REVOKEDINFO *
590OCSP_REVOKEDINFO_new(void) 628OCSP_REVOKEDINFO_new(void)
591{ 629{
592 return (OCSP_REVOKEDINFO *)ASN1_item_new(&OCSP_REVOKEDINFO_it); 630 return (OCSP_REVOKEDINFO *)ASN1_item_new(&OCSP_REVOKEDINFO_it);
593} 631}
632LCRYPTO_ALIAS(OCSP_REVOKEDINFO_new);
594 633
595void 634void
596OCSP_REVOKEDINFO_free(OCSP_REVOKEDINFO *a) 635OCSP_REVOKEDINFO_free(OCSP_REVOKEDINFO *a)
597{ 636{
598 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REVOKEDINFO_it); 637 ASN1_item_free((ASN1_VALUE *)a, &OCSP_REVOKEDINFO_it);
599} 638}
639LCRYPTO_ALIAS(OCSP_REVOKEDINFO_free);
600 640
601static const ASN1_TEMPLATE OCSP_CERTSTATUS_ch_tt[] = { 641static const ASN1_TEMPLATE OCSP_CERTSTATUS_ch_tt[] = {
602 { 642 {
@@ -639,24 +679,28 @@ d2i_OCSP_CERTSTATUS(OCSP_CERTSTATUS **a, const unsigned char **in, long len)
639 return (OCSP_CERTSTATUS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 679 return (OCSP_CERTSTATUS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
640 &OCSP_CERTSTATUS_it); 680 &OCSP_CERTSTATUS_it);
641} 681}
682LCRYPTO_ALIAS(d2i_OCSP_CERTSTATUS);
642 683
643int 684int
644i2d_OCSP_CERTSTATUS(OCSP_CERTSTATUS *a, unsigned char **out) 685i2d_OCSP_CERTSTATUS(OCSP_CERTSTATUS *a, unsigned char **out)
645{ 686{
646 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CERTSTATUS_it); 687 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CERTSTATUS_it);
647} 688}
689LCRYPTO_ALIAS(i2d_OCSP_CERTSTATUS);
648 690
649OCSP_CERTSTATUS * 691OCSP_CERTSTATUS *
650OCSP_CERTSTATUS_new(void) 692OCSP_CERTSTATUS_new(void)
651{ 693{
652 return (OCSP_CERTSTATUS *)ASN1_item_new(&OCSP_CERTSTATUS_it); 694 return (OCSP_CERTSTATUS *)ASN1_item_new(&OCSP_CERTSTATUS_it);
653} 695}
696LCRYPTO_ALIAS(OCSP_CERTSTATUS_new);
654 697
655void 698void
656OCSP_CERTSTATUS_free(OCSP_CERTSTATUS *a) 699OCSP_CERTSTATUS_free(OCSP_CERTSTATUS *a)
657{ 700{
658 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CERTSTATUS_it); 701 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CERTSTATUS_it);
659} 702}
703LCRYPTO_ALIAS(OCSP_CERTSTATUS_free);
660 704
661static const ASN1_TEMPLATE OCSP_SINGLERESP_seq_tt[] = { 705static const ASN1_TEMPLATE OCSP_SINGLERESP_seq_tt[] = {
662 { 706 {
@@ -713,24 +757,28 @@ d2i_OCSP_SINGLERESP(OCSP_SINGLERESP **a, const unsigned char **in, long len)
713 return (OCSP_SINGLERESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 757 return (OCSP_SINGLERESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
714 &OCSP_SINGLERESP_it); 758 &OCSP_SINGLERESP_it);
715} 759}
760LCRYPTO_ALIAS(d2i_OCSP_SINGLERESP);
716 761
717int 762int
718i2d_OCSP_SINGLERESP(OCSP_SINGLERESP *a, unsigned char **out) 763i2d_OCSP_SINGLERESP(OCSP_SINGLERESP *a, unsigned char **out)
719{ 764{
720 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SINGLERESP_it); 765 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SINGLERESP_it);
721} 766}
767LCRYPTO_ALIAS(i2d_OCSP_SINGLERESP);
722 768
723OCSP_SINGLERESP * 769OCSP_SINGLERESP *
724OCSP_SINGLERESP_new(void) 770OCSP_SINGLERESP_new(void)
725{ 771{
726 return (OCSP_SINGLERESP *)ASN1_item_new(&OCSP_SINGLERESP_it); 772 return (OCSP_SINGLERESP *)ASN1_item_new(&OCSP_SINGLERESP_it);
727} 773}
774LCRYPTO_ALIAS(OCSP_SINGLERESP_new);
728 775
729void 776void
730OCSP_SINGLERESP_free(OCSP_SINGLERESP *a) 777OCSP_SINGLERESP_free(OCSP_SINGLERESP *a)
731{ 778{
732 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SINGLERESP_it); 779 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SINGLERESP_it);
733} 780}
781LCRYPTO_ALIAS(OCSP_SINGLERESP_free);
734 782
735static const ASN1_TEMPLATE OCSP_RESPDATA_seq_tt[] = { 783static const ASN1_TEMPLATE OCSP_RESPDATA_seq_tt[] = {
736 { 784 {
@@ -787,24 +835,28 @@ d2i_OCSP_RESPDATA(OCSP_RESPDATA **a, const unsigned char **in, long len)
787 return (OCSP_RESPDATA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 835 return (OCSP_RESPDATA *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
788 &OCSP_RESPDATA_it); 836 &OCSP_RESPDATA_it);
789} 837}
838LCRYPTO_ALIAS(d2i_OCSP_RESPDATA);
790 839
791int 840int
792i2d_OCSP_RESPDATA(OCSP_RESPDATA *a, unsigned char **out) 841i2d_OCSP_RESPDATA(OCSP_RESPDATA *a, unsigned char **out)
793{ 842{
794 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPDATA_it); 843 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_RESPDATA_it);
795} 844}
845LCRYPTO_ALIAS(i2d_OCSP_RESPDATA);
796 846
797OCSP_RESPDATA * 847OCSP_RESPDATA *
798OCSP_RESPDATA_new(void) 848OCSP_RESPDATA_new(void)
799{ 849{
800 return (OCSP_RESPDATA *)ASN1_item_new(&OCSP_RESPDATA_it); 850 return (OCSP_RESPDATA *)ASN1_item_new(&OCSP_RESPDATA_it);
801} 851}
852LCRYPTO_ALIAS(OCSP_RESPDATA_new);
802 853
803void 854void
804OCSP_RESPDATA_free(OCSP_RESPDATA *a) 855OCSP_RESPDATA_free(OCSP_RESPDATA *a)
805{ 856{
806 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPDATA_it); 857 ASN1_item_free((ASN1_VALUE *)a, &OCSP_RESPDATA_it);
807} 858}
859LCRYPTO_ALIAS(OCSP_RESPDATA_free);
808 860
809static const ASN1_TEMPLATE OCSP_BASICRESP_seq_tt[] = { 861static const ASN1_TEMPLATE OCSP_BASICRESP_seq_tt[] = {
810 { 862 {
@@ -854,24 +906,28 @@ d2i_OCSP_BASICRESP(OCSP_BASICRESP **a, const unsigned char **in, long len)
854 return (OCSP_BASICRESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 906 return (OCSP_BASICRESP *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
855 &OCSP_BASICRESP_it); 907 &OCSP_BASICRESP_it);
856} 908}
909LCRYPTO_ALIAS(d2i_OCSP_BASICRESP);
857 910
858int 911int
859i2d_OCSP_BASICRESP(OCSP_BASICRESP *a, unsigned char **out) 912i2d_OCSP_BASICRESP(OCSP_BASICRESP *a, unsigned char **out)
860{ 913{
861 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_BASICRESP_it); 914 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_BASICRESP_it);
862} 915}
916LCRYPTO_ALIAS(i2d_OCSP_BASICRESP);
863 917
864OCSP_BASICRESP * 918OCSP_BASICRESP *
865OCSP_BASICRESP_new(void) 919OCSP_BASICRESP_new(void)
866{ 920{
867 return (OCSP_BASICRESP *)ASN1_item_new(&OCSP_BASICRESP_it); 921 return (OCSP_BASICRESP *)ASN1_item_new(&OCSP_BASICRESP_it);
868} 922}
923LCRYPTO_ALIAS(OCSP_BASICRESP_new);
869 924
870void 925void
871OCSP_BASICRESP_free(OCSP_BASICRESP *a) 926OCSP_BASICRESP_free(OCSP_BASICRESP *a)
872{ 927{
873 ASN1_item_free((ASN1_VALUE *)a, &OCSP_BASICRESP_it); 928 ASN1_item_free((ASN1_VALUE *)a, &OCSP_BASICRESP_it);
874} 929}
930LCRYPTO_ALIAS(OCSP_BASICRESP_free);
875 931
876static const ASN1_TEMPLATE OCSP_CRLID_seq_tt[] = { 932static const ASN1_TEMPLATE OCSP_CRLID_seq_tt[] = {
877 { 933 {
@@ -914,24 +970,28 @@ d2i_OCSP_CRLID(OCSP_CRLID **a, const unsigned char **in, long len)
914 return (OCSP_CRLID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 970 return (OCSP_CRLID *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
915 &OCSP_CRLID_it); 971 &OCSP_CRLID_it);
916} 972}
973LCRYPTO_ALIAS(d2i_OCSP_CRLID);
917 974
918int 975int
919i2d_OCSP_CRLID(OCSP_CRLID *a, unsigned char **out) 976i2d_OCSP_CRLID(OCSP_CRLID *a, unsigned char **out)
920{ 977{
921 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CRLID_it); 978 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_CRLID_it);
922} 979}
980LCRYPTO_ALIAS(i2d_OCSP_CRLID);
923 981
924OCSP_CRLID * 982OCSP_CRLID *
925OCSP_CRLID_new(void) 983OCSP_CRLID_new(void)
926{ 984{
927 return (OCSP_CRLID *)ASN1_item_new(&OCSP_CRLID_it); 985 return (OCSP_CRLID *)ASN1_item_new(&OCSP_CRLID_it);
928} 986}
987LCRYPTO_ALIAS(OCSP_CRLID_new);
929 988
930void 989void
931OCSP_CRLID_free(OCSP_CRLID *a) 990OCSP_CRLID_free(OCSP_CRLID *a)
932{ 991{
933 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CRLID_it); 992 ASN1_item_free((ASN1_VALUE *)a, &OCSP_CRLID_it);
934} 993}
994LCRYPTO_ALIAS(OCSP_CRLID_free);
935 995
936static const ASN1_TEMPLATE OCSP_SERVICELOC_seq_tt[] = { 996static const ASN1_TEMPLATE OCSP_SERVICELOC_seq_tt[] = {
937 { 997 {
@@ -967,21 +1027,25 @@ d2i_OCSP_SERVICELOC(OCSP_SERVICELOC **a, const unsigned char **in, long len)
967 return (OCSP_SERVICELOC *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 1027 return (OCSP_SERVICELOC *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
968 &OCSP_SERVICELOC_it); 1028 &OCSP_SERVICELOC_it);
969} 1029}
1030LCRYPTO_ALIAS(d2i_OCSP_SERVICELOC);
970 1031
971int 1032int
972i2d_OCSP_SERVICELOC(OCSP_SERVICELOC *a, unsigned char **out) 1033i2d_OCSP_SERVICELOC(OCSP_SERVICELOC *a, unsigned char **out)
973{ 1034{
974 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SERVICELOC_it); 1035 return ASN1_item_i2d((ASN1_VALUE *)a, out, &OCSP_SERVICELOC_it);
975} 1036}
1037LCRYPTO_ALIAS(i2d_OCSP_SERVICELOC);
976 1038
977OCSP_SERVICELOC * 1039OCSP_SERVICELOC *
978OCSP_SERVICELOC_new(void) 1040OCSP_SERVICELOC_new(void)
979{ 1041{
980 return (OCSP_SERVICELOC *)ASN1_item_new(&OCSP_SERVICELOC_it); 1042 return (OCSP_SERVICELOC *)ASN1_item_new(&OCSP_SERVICELOC_it);
981} 1043}
1044LCRYPTO_ALIAS(OCSP_SERVICELOC_new);
982 1045
983void 1046void
984OCSP_SERVICELOC_free(OCSP_SERVICELOC *a) 1047OCSP_SERVICELOC_free(OCSP_SERVICELOC *a)
985{ 1048{
986 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SERVICELOC_it); 1049 ASN1_item_free((ASN1_VALUE *)a, &OCSP_SERVICELOC_it);
987} 1050}
1051LCRYPTO_ALIAS(OCSP_SERVICELOC_free);
diff --git a/src/lib/libcrypto/ocsp/ocsp_cl.c b/src/lib/libcrypto/ocsp/ocsp_cl.c
index 7747020221..89113f78b8 100644
--- a/src/lib/libcrypto/ocsp/ocsp_cl.c
+++ b/src/lib/libcrypto/ocsp/ocsp_cl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_cl.c,v 1.22 2022/12/26 07:18:52 jmc Exp $ */ 1/* $OpenBSD: ocsp_cl.c,v 1.23 2023/07/08 10:44:00 beck Exp $ */
2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL 2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
3 * project. */ 3 * project. */
4 4
@@ -99,6 +99,7 @@ OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid)
99 OCSP_ONEREQ_free(one); 99 OCSP_ONEREQ_free(one);
100 return NULL; 100 return NULL;
101} 101}
102LCRYPTO_ALIAS(OCSP_request_add0_id);
102 103
103/* Set requestorName from an X509_NAME structure */ 104/* Set requestorName from an X509_NAME structure */
104int 105int
@@ -119,6 +120,7 @@ OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm)
119 req->tbsRequest->requestorName = gen; 120 req->tbsRequest->requestorName = gen;
120 return 1; 121 return 1;
121} 122}
123LCRYPTO_ALIAS(OCSP_request_set1_name);
122 124
123/* Add a certificate to an OCSP request */ 125/* Add a certificate to an OCSP request */
124int 126int
@@ -141,6 +143,7 @@ OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert)
141 X509_up_ref(cert); 143 X509_up_ref(cert);
142 return 1; 144 return 1;
143} 145}
146LCRYPTO_ALIAS(OCSP_request_add1_cert);
144 147
145/* Sign an OCSP request set the requestorName to the subject 148/* Sign an OCSP request set the requestorName to the subject
146 * name of an optional signers certificate and include one 149 * name of an optional signers certificate and include one
@@ -186,6 +189,7 @@ err:
186 req->optionalSignature = NULL; 189 req->optionalSignature = NULL;
187 return 0; 190 return 0;
188} 191}
192LCRYPTO_ALIAS(OCSP_request_sign);
189 193
190/* Get response status */ 194/* Get response status */
191int 195int
@@ -193,6 +197,7 @@ OCSP_response_status(OCSP_RESPONSE *resp)
193{ 197{
194 return ASN1_ENUMERATED_get(resp->responseStatus); 198 return ASN1_ENUMERATED_get(resp->responseStatus);
195} 199}
200LCRYPTO_ALIAS(OCSP_response_status);
196 201
197/* Extract basic response from OCSP_RESPONSE or NULL if 202/* Extract basic response from OCSP_RESPONSE or NULL if
198 * no basic response present. 203 * no basic response present.
@@ -214,6 +219,7 @@ OCSP_response_get1_basic(OCSP_RESPONSE *resp)
214 219
215 return ASN1_item_unpack(rb->response, &OCSP_BASICRESP_it); 220 return ASN1_item_unpack(rb->response, &OCSP_BASICRESP_it);
216} 221}
222LCRYPTO_ALIAS(OCSP_response_get1_basic);
217 223
218/* Return number of OCSP_SINGLERESP responses present in 224/* Return number of OCSP_SINGLERESP responses present in
219 * a basic response. 225 * a basic response.
@@ -225,6 +231,7 @@ OCSP_resp_count(OCSP_BASICRESP *bs)
225 return -1; 231 return -1;
226 return sk_OCSP_SINGLERESP_num(bs->tbsResponseData->responses); 232 return sk_OCSP_SINGLERESP_num(bs->tbsResponseData->responses);
227} 233}
234LCRYPTO_ALIAS(OCSP_resp_count);
228 235
229/* Extract an OCSP_SINGLERESP response with a given index */ 236/* Extract an OCSP_SINGLERESP response with a given index */
230OCSP_SINGLERESP * 237OCSP_SINGLERESP *
@@ -234,18 +241,21 @@ OCSP_resp_get0(OCSP_BASICRESP *bs, int idx)
234 return NULL; 241 return NULL;
235 return sk_OCSP_SINGLERESP_value(bs->tbsResponseData->responses, idx); 242 return sk_OCSP_SINGLERESP_value(bs->tbsResponseData->responses, idx);
236} 243}
244LCRYPTO_ALIAS(OCSP_resp_get0);
237 245
238const ASN1_GENERALIZEDTIME * 246const ASN1_GENERALIZEDTIME *
239OCSP_resp_get0_produced_at(const OCSP_BASICRESP *bs) 247OCSP_resp_get0_produced_at(const OCSP_BASICRESP *bs)
240{ 248{
241 return bs->tbsResponseData->producedAt; 249 return bs->tbsResponseData->producedAt;
242} 250}
251LCRYPTO_ALIAS(OCSP_resp_get0_produced_at);
243 252
244const STACK_OF(X509) * 253const STACK_OF(X509) *
245OCSP_resp_get0_certs(const OCSP_BASICRESP *bs) 254OCSP_resp_get0_certs(const OCSP_BASICRESP *bs)
246{ 255{
247 return bs->certs; 256 return bs->certs;
248} 257}
258LCRYPTO_ALIAS(OCSP_resp_get0_certs);
249 259
250int 260int
251OCSP_resp_get0_id(const OCSP_BASICRESP *bs, const ASN1_OCTET_STRING **pid, 261OCSP_resp_get0_id(const OCSP_BASICRESP *bs, const ASN1_OCTET_STRING **pid,
@@ -265,24 +275,28 @@ OCSP_resp_get0_id(const OCSP_BASICRESP *bs, const ASN1_OCTET_STRING **pid,
265 275
266 return 1; 276 return 1;
267} 277}
278LCRYPTO_ALIAS(OCSP_resp_get0_id);
268 279
269const ASN1_OCTET_STRING * 280const ASN1_OCTET_STRING *
270OCSP_resp_get0_signature(const OCSP_BASICRESP *bs) 281OCSP_resp_get0_signature(const OCSP_BASICRESP *bs)
271{ 282{
272 return bs->signature; 283 return bs->signature;
273} 284}
285LCRYPTO_ALIAS(OCSP_resp_get0_signature);
274 286
275const X509_ALGOR * 287const X509_ALGOR *
276OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs) 288OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs)
277{ 289{
278 return bs->signatureAlgorithm; 290 return bs->signatureAlgorithm;
279} 291}
292LCRYPTO_ALIAS(OCSP_resp_get0_tbs_sigalg);
280 293
281const OCSP_RESPDATA * 294const OCSP_RESPDATA *
282OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs) 295OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs)
283{ 296{
284 return bs->tbsResponseData; 297 return bs->tbsResponseData;
285} 298}
299LCRYPTO_ALIAS(OCSP_resp_get0_respdata);
286 300
287/* Look single response matching a given certificate ID */ 301/* Look single response matching a given certificate ID */
288int 302int
@@ -306,6 +320,7 @@ OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last)
306 } 320 }
307 return -1; 321 return -1;
308} 322}
323LCRYPTO_ALIAS(OCSP_resp_find);
309 324
310/* Extract status information from an OCSP_SINGLERESP structure. 325/* Extract status information from an OCSP_SINGLERESP structure.
311 * Note: the revtime and reason values are only set if the 326 * Note: the revtime and reason values are only set if the
@@ -343,6 +358,7 @@ OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
343 *nextupd = single->nextUpdate; 358 *nextupd = single->nextUpdate;
344 return ret; 359 return ret;
345} 360}
361LCRYPTO_ALIAS(OCSP_single_get0_status);
346 362
347/* This function combines the previous ones: look up a certificate ID and 363/* This function combines the previous ones: look up a certificate ID and
348 * if found extract status information. Return 0 is successful. 364 * if found extract status information. Return 0 is successful.
@@ -365,6 +381,7 @@ OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
365 *status = i; 381 *status = i;
366 return 1; 382 return 1;
367} 383}
384LCRYPTO_ALIAS(OCSP_resp_find_status);
368 385
369/* Check validity of thisUpdate and nextUpdate fields. It is possible that the request will 386/* Check validity of thisUpdate and nextUpdate fields. It is possible that the request will
370 * take a few seconds to process and/or the time wont be totally accurate. Therefore to avoid 387 * take a few seconds to process and/or the time wont be totally accurate. Therefore to avoid
@@ -442,9 +459,11 @@ OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
442 459
443 return 1; 460 return 1;
444} 461}
462LCRYPTO_ALIAS(OCSP_check_validity);
445 463
446const OCSP_CERTID * 464const OCSP_CERTID *
447OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *single) 465OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *single)
448{ 466{
449 return single->certId; 467 return single->certId;
450} 468}
469LCRYPTO_ALIAS(OCSP_SINGLERESP_get0_id);
diff --git a/src/lib/libcrypto/ocsp/ocsp_err.c b/src/lib/libcrypto/ocsp/ocsp_err.c
index 7cf5b7e8a1..865091f542 100644
--- a/src/lib/libcrypto/ocsp/ocsp_err.c
+++ b/src/lib/libcrypto/ocsp/ocsp_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_err.c,v 1.9 2022/07/12 14:42:49 kn Exp $ */ 1/* $OpenBSD: ocsp_err.c,v 1.10 2023/07/08 10:44:00 beck 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 *
@@ -116,3 +116,4 @@ ERR_load_OCSP_strings(void)
116 } 116 }
117#endif 117#endif
118} 118}
119LCRYPTO_ALIAS(ERR_load_OCSP_strings);
diff --git a/src/lib/libcrypto/ocsp/ocsp_ext.c b/src/lib/libcrypto/ocsp/ocsp_ext.c
index 9605d859b4..9f8cb74b6a 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ext.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_ext.c,v 1.22 2022/12/26 07:18:52 jmc Exp $ */ 1/* $OpenBSD: ocsp_ext.c,v 1.23 2023/07/08 10:44:00 beck Exp $ */
2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL 2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
3 * project. */ 3 * project. */
4 4
@@ -82,6 +82,7 @@ OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)
82{ 82{
83 return X509v3_get_ext_count(x->tbsRequest->requestExtensions); 83 return X509v3_get_ext_count(x->tbsRequest->requestExtensions);
84} 84}
85LCRYPTO_ALIAS(OCSP_REQUEST_get_ext_count);
85 86
86int 87int
87OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos) 88OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
@@ -89,6 +90,7 @@ OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
89 return X509v3_get_ext_by_NID(x->tbsRequest->requestExtensions, nid, 90 return X509v3_get_ext_by_NID(x->tbsRequest->requestExtensions, nid,
90 lastpos); 91 lastpos);
91} 92}
93LCRYPTO_ALIAS(OCSP_REQUEST_get_ext_by_NID);
92 94
93int 95int
94OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj, 96OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
@@ -97,6 +99,7 @@ OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
97 return X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions, obj, 99 return X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions, obj,
98 lastpos); 100 lastpos);
99} 101}
102LCRYPTO_ALIAS(OCSP_REQUEST_get_ext_by_OBJ);
100 103
101int 104int
102OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos) 105OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
@@ -104,24 +107,28 @@ OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
104 return X509v3_get_ext_by_critical(x->tbsRequest->requestExtensions, 107 return X509v3_get_ext_by_critical(x->tbsRequest->requestExtensions,
105 crit, lastpos); 108 crit, lastpos);
106} 109}
110LCRYPTO_ALIAS(OCSP_REQUEST_get_ext_by_critical);
107 111
108X509_EXTENSION * 112X509_EXTENSION *
109OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc) 113OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)
110{ 114{
111 return X509v3_get_ext(x->tbsRequest->requestExtensions, loc); 115 return X509v3_get_ext(x->tbsRequest->requestExtensions, loc);
112} 116}
117LCRYPTO_ALIAS(OCSP_REQUEST_get_ext);
113 118
114X509_EXTENSION * 119X509_EXTENSION *
115OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc) 120OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc)
116{ 121{
117 return X509v3_delete_ext(x->tbsRequest->requestExtensions, loc); 122 return X509v3_delete_ext(x->tbsRequest->requestExtensions, loc);
118} 123}
124LCRYPTO_ALIAS(OCSP_REQUEST_delete_ext);
119 125
120void * 126void *
121OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx) 127OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)
122{ 128{
123 return X509V3_get_d2i(x->tbsRequest->requestExtensions, nid, crit, idx); 129 return X509V3_get_d2i(x->tbsRequest->requestExtensions, nid, crit, idx);
124} 130}
131LCRYPTO_ALIAS(OCSP_REQUEST_get1_ext_d2i);
125 132
126int 133int
127OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit, 134OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
@@ -130,6 +137,7 @@ OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
130 return X509V3_add1_i2d(&x->tbsRequest->requestExtensions, nid, value, 137 return X509V3_add1_i2d(&x->tbsRequest->requestExtensions, nid, value,
131 crit, flags); 138 crit, flags);
132} 139}
140LCRYPTO_ALIAS(OCSP_REQUEST_add1_ext_i2d);
133 141
134int 142int
135OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc) 143OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
@@ -137,6 +145,7 @@ OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
137 return X509v3_add_ext(&(x->tbsRequest->requestExtensions), ex, 145 return X509v3_add_ext(&(x->tbsRequest->requestExtensions), ex,
138 loc) != NULL; 146 loc) != NULL;
139} 147}
148LCRYPTO_ALIAS(OCSP_REQUEST_add_ext);
140 149
141/* Single extensions */ 150/* Single extensions */
142 151
@@ -145,18 +154,21 @@ OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x)
145{ 154{
146 return X509v3_get_ext_count(x->singleRequestExtensions); 155 return X509v3_get_ext_count(x->singleRequestExtensions);
147} 156}
157LCRYPTO_ALIAS(OCSP_ONEREQ_get_ext_count);
148 158
149int 159int
150OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos) 160OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos)
151{ 161{
152 return X509v3_get_ext_by_NID(x->singleRequestExtensions, nid, lastpos); 162 return X509v3_get_ext_by_NID(x->singleRequestExtensions, nid, lastpos);
153} 163}
164LCRYPTO_ALIAS(OCSP_ONEREQ_get_ext_by_NID);
154 165
155int 166int
156OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj, int lastpos) 167OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj, int lastpos)
157{ 168{
158 return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos); 169 return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos);
159} 170}
171LCRYPTO_ALIAS(OCSP_ONEREQ_get_ext_by_OBJ);
160 172
161int 173int
162OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos) 174OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
@@ -164,24 +176,28 @@ OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
164 return X509v3_get_ext_by_critical(x->singleRequestExtensions, crit, 176 return X509v3_get_ext_by_critical(x->singleRequestExtensions, crit,
165 lastpos); 177 lastpos);
166} 178}
179LCRYPTO_ALIAS(OCSP_ONEREQ_get_ext_by_critical);
167 180
168X509_EXTENSION * 181X509_EXTENSION *
169OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc) 182OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc)
170{ 183{
171 return X509v3_get_ext(x->singleRequestExtensions, loc); 184 return X509v3_get_ext(x->singleRequestExtensions, loc);
172} 185}
186LCRYPTO_ALIAS(OCSP_ONEREQ_get_ext);
173 187
174X509_EXTENSION * 188X509_EXTENSION *
175OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc) 189OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc)
176{ 190{
177 return X509v3_delete_ext(x->singleRequestExtensions, loc); 191 return X509v3_delete_ext(x->singleRequestExtensions, loc);
178} 192}
193LCRYPTO_ALIAS(OCSP_ONEREQ_delete_ext);
179 194
180void * 195void *
181OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx) 196OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx)
182{ 197{
183 return X509V3_get_d2i(x->singleRequestExtensions, nid, crit, idx); 198 return X509V3_get_d2i(x->singleRequestExtensions, nid, crit, idx);
184} 199}
200LCRYPTO_ALIAS(OCSP_ONEREQ_get1_ext_d2i);
185 201
186int 202int
187OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit, 203OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
@@ -190,12 +206,14 @@ OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
190 return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit, 206 return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit,
191 flags); 207 flags);
192} 208}
209LCRYPTO_ALIAS(OCSP_ONEREQ_add1_ext_i2d);
193 210
194int 211int
195OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc) 212OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc)
196{ 213{
197 return X509v3_add_ext(&(x->singleRequestExtensions), ex, loc) != NULL; 214 return X509v3_add_ext(&(x->singleRequestExtensions), ex, loc) != NULL;
198} 215}
216LCRYPTO_ALIAS(OCSP_ONEREQ_add_ext);
199 217
200/* OCSP Basic response */ 218/* OCSP Basic response */
201 219
@@ -204,6 +222,7 @@ OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)
204{ 222{
205 return X509v3_get_ext_count(x->tbsResponseData->responseExtensions); 223 return X509v3_get_ext_count(x->tbsResponseData->responseExtensions);
206} 224}
225LCRYPTO_ALIAS(OCSP_BASICRESP_get_ext_count);
207 226
208int 227int
209OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos) 228OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
@@ -211,6 +230,7 @@ OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
211 return X509v3_get_ext_by_NID(x->tbsResponseData->responseExtensions, 230 return X509v3_get_ext_by_NID(x->tbsResponseData->responseExtensions,
212 nid, lastpos); 231 nid, lastpos);
213} 232}
233LCRYPTO_ALIAS(OCSP_BASICRESP_get_ext_by_NID);
214 234
215int 235int
216OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj, 236OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
@@ -219,6 +239,7 @@ OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
219 return X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions, 239 return X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions,
220 obj, lastpos); 240 obj, lastpos);
221} 241}
242LCRYPTO_ALIAS(OCSP_BASICRESP_get_ext_by_OBJ);
222 243
223int 244int
224OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos) 245OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos)
@@ -226,18 +247,21 @@ OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos)
226 return X509v3_get_ext_by_critical( 247 return X509v3_get_ext_by_critical(
227 x->tbsResponseData->responseExtensions, crit, lastpos); 248 x->tbsResponseData->responseExtensions, crit, lastpos);
228} 249}
250LCRYPTO_ALIAS(OCSP_BASICRESP_get_ext_by_critical);
229 251
230X509_EXTENSION * 252X509_EXTENSION *
231OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc) 253OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)
232{ 254{
233 return X509v3_get_ext(x->tbsResponseData->responseExtensions, loc); 255 return X509v3_get_ext(x->tbsResponseData->responseExtensions, loc);
234} 256}
257LCRYPTO_ALIAS(OCSP_BASICRESP_get_ext);
235 258
236X509_EXTENSION * 259X509_EXTENSION *
237OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc) 260OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc)
238{ 261{
239 return X509v3_delete_ext(x->tbsResponseData->responseExtensions, loc); 262 return X509v3_delete_ext(x->tbsResponseData->responseExtensions, loc);
240} 263}
264LCRYPTO_ALIAS(OCSP_BASICRESP_delete_ext);
241 265
242void * 266void *
243OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx) 267OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx)
@@ -245,6 +269,7 @@ OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx)
245 return X509V3_get_d2i(x->tbsResponseData->responseExtensions, nid, 269 return X509V3_get_d2i(x->tbsResponseData->responseExtensions, nid,
246 crit, idx); 270 crit, idx);
247} 271}
272LCRYPTO_ALIAS(OCSP_BASICRESP_get1_ext_d2i);
248 273
249int 274int
250OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit, 275OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
@@ -253,6 +278,7 @@ OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
253 return X509V3_add1_i2d(&x->tbsResponseData->responseExtensions, nid, 278 return X509V3_add1_i2d(&x->tbsResponseData->responseExtensions, nid,
254 value, crit, flags); 279 value, crit, flags);
255} 280}
281LCRYPTO_ALIAS(OCSP_BASICRESP_add1_ext_i2d);
256 282
257int 283int
258OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc) 284OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
@@ -260,6 +286,7 @@ OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
260 return X509v3_add_ext(&(x->tbsResponseData->responseExtensions), ex, 286 return X509v3_add_ext(&(x->tbsResponseData->responseExtensions), ex,
261 loc) != NULL; 287 loc) != NULL;
262} 288}
289LCRYPTO_ALIAS(OCSP_BASICRESP_add_ext);
263 290
264/* OCSP single response extensions */ 291/* OCSP single response extensions */
265 292
@@ -268,12 +295,14 @@ OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x)
268{ 295{
269 return X509v3_get_ext_count(x->singleExtensions); 296 return X509v3_get_ext_count(x->singleExtensions);
270} 297}
298LCRYPTO_ALIAS(OCSP_SINGLERESP_get_ext_count);
271 299
272int 300int
273OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos) 301OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos)
274{ 302{
275 return X509v3_get_ext_by_NID(x->singleExtensions, nid, lastpos); 303 return X509v3_get_ext_by_NID(x->singleExtensions, nid, lastpos);
276} 304}
305LCRYPTO_ALIAS(OCSP_SINGLERESP_get_ext_by_NID);
277 306
278int 307int
279OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj, 308OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,
@@ -281,30 +310,35 @@ OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,
281{ 310{
282 return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos); 311 return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos);
283} 312}
313LCRYPTO_ALIAS(OCSP_SINGLERESP_get_ext_by_OBJ);
284 314
285int 315int
286OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, int lastpos) 316OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, int lastpos)
287{ 317{
288 return X509v3_get_ext_by_critical(x->singleExtensions, crit, lastpos); 318 return X509v3_get_ext_by_critical(x->singleExtensions, crit, lastpos);
289} 319}
320LCRYPTO_ALIAS(OCSP_SINGLERESP_get_ext_by_critical);
290 321
291X509_EXTENSION * 322X509_EXTENSION *
292OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc) 323OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc)
293{ 324{
294 return X509v3_get_ext(x->singleExtensions, loc); 325 return X509v3_get_ext(x->singleExtensions, loc);
295} 326}
327LCRYPTO_ALIAS(OCSP_SINGLERESP_get_ext);
296 328
297X509_EXTENSION * 329X509_EXTENSION *
298OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc) 330OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc)
299{ 331{
300 return X509v3_delete_ext(x->singleExtensions, loc); 332 return X509v3_delete_ext(x->singleExtensions, loc);
301} 333}
334LCRYPTO_ALIAS(OCSP_SINGLERESP_delete_ext);
302 335
303void * 336void *
304OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx) 337OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx)
305{ 338{
306 return X509V3_get_d2i(x->singleExtensions, nid, crit, idx); 339 return X509V3_get_d2i(x->singleExtensions, nid, crit, idx);
307} 340}
341LCRYPTO_ALIAS(OCSP_SINGLERESP_get1_ext_d2i);
308 342
309int 343int
310OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit, 344OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
@@ -312,12 +346,14 @@ OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
312{ 346{
313 return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags); 347 return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags);
314} 348}
349LCRYPTO_ALIAS(OCSP_SINGLERESP_add1_ext_i2d);
315 350
316int 351int
317OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc) 352OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
318{ 353{
319 return X509v3_add_ext(&(x->singleExtensions), ex, loc) != NULL; 354 return X509v3_add_ext(&(x->singleExtensions), ex, loc) != NULL;
320} 355}
356LCRYPTO_ALIAS(OCSP_SINGLERESP_add_ext);
321 357
322/* Nonce handling functions */ 358/* Nonce handling functions */
323 359
@@ -367,6 +403,7 @@ OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)
367{ 403{
368 return ocsp_add1_nonce(&req->tbsRequest->requestExtensions, val, len); 404 return ocsp_add1_nonce(&req->tbsRequest->requestExtensions, val, len);
369} 405}
406LCRYPTO_ALIAS(OCSP_request_add1_nonce);
370 407
371/* Same as above but for a response */ 408/* Same as above but for a response */
372int 409int
@@ -375,6 +412,7 @@ OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
375 return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val, 412 return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val,
376 len); 413 len);
377} 414}
415LCRYPTO_ALIAS(OCSP_basic_add1_nonce);
378 416
379/* Check nonce validity in a request and response. 417/* Check nonce validity in a request and response.
380 * Return value reflects result: 418 * Return value reflects result:
@@ -420,6 +458,7 @@ OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
420 return 0; 458 return 0;
421 return 1; 459 return 1;
422} 460}
461LCRYPTO_ALIAS(OCSP_check_nonce);
423 462
424/* Copy the nonce value (if any) from an OCSP request to 463/* Copy the nonce value (if any) from an OCSP request to
425 * a response. 464 * a response.
@@ -438,6 +477,7 @@ OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req)
438 req_ext = OCSP_REQUEST_get_ext(req, req_idx); 477 req_ext = OCSP_REQUEST_get_ext(req, req_idx);
439 return OCSP_BASICRESP_add_ext(resp, req_ext, -1); 478 return OCSP_BASICRESP_add_ext(resp, req_ext, -1);
440} 479}
480LCRYPTO_ALIAS(OCSP_copy_nonce);
441 481
442X509_EXTENSION * 482X509_EXTENSION *
443OCSP_crlID_new(const char *url, long *n, char *tim) 483OCSP_crlID_new(const char *url, long *n, char *tim)
@@ -472,6 +512,7 @@ err:
472 OCSP_CRLID_free(cid); 512 OCSP_CRLID_free(cid);
473 return x; 513 return x;
474} 514}
515LCRYPTO_ALIAS(OCSP_crlID_new);
475 516
476/* AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER */ 517/* AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER */
477X509_EXTENSION * 518X509_EXTENSION *
@@ -497,6 +538,7 @@ OCSP_accept_responses_new(char **oids)
497 sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free); 538 sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
498 return x; 539 return x;
499} 540}
541LCRYPTO_ALIAS(OCSP_accept_responses_new);
500 542
501/* ArchiveCutoff ::= GeneralizedTime */ 543/* ArchiveCutoff ::= GeneralizedTime */
502X509_EXTENSION * 544X509_EXTENSION *
@@ -516,6 +558,7 @@ err:
516 ASN1_GENERALIZEDTIME_free(gt); 558 ASN1_GENERALIZEDTIME_free(gt);
517 return x; 559 return x;
518} 560}
561LCRYPTO_ALIAS(OCSP_archive_cutoff_new);
519 562
520/* per ACCESS_DESCRIPTION parameter are oids, of which there are currently 563/* per ACCESS_DESCRIPTION parameter are oids, of which there are currently
521 * two--NID_ad_ocsp, NID_id_ad_caIssuers--and GeneralName value. This 564 * two--NID_ad_ocsp, NID_id_ad_caIssuers--and GeneralName value. This
@@ -566,3 +609,4 @@ err:
566 OCSP_SERVICELOC_free(sloc); 609 OCSP_SERVICELOC_free(sloc);
567 return x; 610 return x;
568} 611}
612LCRYPTO_ALIAS(OCSP_url_svcloc_new);
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index 255f890397..bf735c72a2 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_ht.c,v 1.25 2018/05/13 10:42:03 tb Exp $ */ 1/* $OpenBSD: ocsp_ht.c,v 1.26 2023/07/08 10:44:00 beck 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 2006. 3 * project 2006.
4 */ 4 */
@@ -115,6 +115,7 @@ OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx)
115 free(rctx->iobuf); 115 free(rctx->iobuf);
116 free(rctx); 116 free(rctx);
117} 117}
118LCRYPTO_ALIAS(OCSP_REQ_CTX_free);
118 119
119int 120int
120OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req) 121OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req)
@@ -128,6 +129,7 @@ OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req)
128 rctx->asn1_len = BIO_get_mem_data(rctx->mem, NULL); 129 rctx->asn1_len = BIO_get_mem_data(rctx->mem, NULL);
129 return 1; 130 return 1;
130} 131}
132LCRYPTO_ALIAS(OCSP_REQ_CTX_set1_req);
131 133
132int 134int
133OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, const char *name, 135OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, const char *name,
@@ -147,6 +149,7 @@ OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, const char *name,
147 return 0; 149 return 0;
148 return 1; 150 return 1;
149} 151}
152LCRYPTO_ALIAS(OCSP_REQ_CTX_add1_header);
150 153
151OCSP_REQ_CTX * 154OCSP_REQ_CTX *
152OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req, int maxline) 155OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req, int maxline)
@@ -192,6 +195,7 @@ OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req, int maxline)
192 195
193 return rctx; 196 return rctx;
194} 197}
198LCRYPTO_ALIAS(OCSP_sendreq_new);
195 199
196/* Parse the HTTP response. This will look like this: 200/* Parse the HTTP response. This will look like this:
197 * "HTTP/1.0 200 OK". We need to obtain the numeric code and 201 * "HTTP/1.0 200 OK". We need to obtain the numeric code and
@@ -437,6 +441,7 @@ next_line:
437 441
438 return 0; 442 return 0;
439} 443}
444LCRYPTO_ALIAS(OCSP_sendreq_nbio);
440 445
441/* Blocking OCSP request handler: now a special case of non-blocking I/O */ 446/* Blocking OCSP request handler: now a special case of non-blocking I/O */
442OCSP_RESPONSE * 447OCSP_RESPONSE *
@@ -461,3 +466,4 @@ OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req)
461 466
462 return NULL; 467 return NULL;
463} 468}
469LCRYPTO_ALIAS(OCSP_sendreq_bio);
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c
index 09bccc0cfd..d3eada2ba6 100644
--- a/src/lib/libcrypto/ocsp/ocsp_lib.c
+++ b/src/lib/libcrypto/ocsp/ocsp_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_lib.c,v 1.25 2022/01/22 00:31:23 inoguchi Exp $ */ 1/* $OpenBSD: ocsp_lib.c,v 1.26 2023/07/08 10:44:00 beck Exp $ */
2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL 2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
3 * project. */ 3 * project. */
4 4
@@ -101,6 +101,7 @@ OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject, const X509 *issuer)
101 101
102 return OCSP_cert_id_new(dgst, iname, ikey, serial); 102 return OCSP_cert_id_new(dgst, iname, ikey, serial);
103} 103}
104LCRYPTO_ALIAS(OCSP_cert_to_id);
104 105
105OCSP_CERTID * 106OCSP_CERTID *
106OCSP_cert_id_new(const EVP_MD *dgst, const X509_NAME *issuerName, 107OCSP_cert_id_new(const EVP_MD *dgst, const X509_NAME *issuerName,
@@ -154,6 +155,7 @@ err:
154 OCSP_CERTID_free(cid); 155 OCSP_CERTID_free(cid);
155 return NULL; 156 return NULL;
156} 157}
158LCRYPTO_ALIAS(OCSP_cert_id_new);
157 159
158int 160int
159OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b) 161OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
@@ -168,6 +170,7 @@ OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
168 return ret; 170 return ret;
169 return ASN1_OCTET_STRING_cmp(a->issuerKeyHash, b->issuerKeyHash); 171 return ASN1_OCTET_STRING_cmp(a->issuerKeyHash, b->issuerKeyHash);
170} 172}
173LCRYPTO_ALIAS(OCSP_id_issuer_cmp);
171 174
172int 175int
173OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b) 176OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
@@ -179,6 +182,7 @@ OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
179 return ret; 182 return ret;
180 return ASN1_INTEGER_cmp(a->serialNumber, b->serialNumber); 183 return ASN1_INTEGER_cmp(a->serialNumber, b->serialNumber);
181} 184}
185LCRYPTO_ALIAS(OCSP_id_cmp);
182 186
183/* Parse a URL and split it up into host, port and path components and whether 187/* Parse a URL and split it up into host, port and path components and whether
184 * it is SSL. 188 * it is SSL.
@@ -235,9 +239,11 @@ OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
235 *pport = port; 239 *pport = port;
236 return 1; 240 return 1;
237} 241}
242LCRYPTO_ALIAS(OCSP_parse_url);
238 243
239OCSP_CERTID * 244OCSP_CERTID *
240OCSP_CERTID_dup(OCSP_CERTID *x) 245OCSP_CERTID_dup(OCSP_CERTID *x)
241{ 246{
242 return ASN1_item_dup(&OCSP_CERTID_it, x); 247 return ASN1_item_dup(&OCSP_CERTID_it, x);
243} 248}
249LCRYPTO_ALIAS(OCSP_CERTID_dup);
diff --git a/src/lib/libcrypto/ocsp/ocsp_prn.c b/src/lib/libcrypto/ocsp/ocsp_prn.c
index fecd14bbfd..7e3175b613 100644
--- a/src/lib/libcrypto/ocsp/ocsp_prn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_prn.c,v 1.9 2022/01/07 09:45:52 tb Exp $ */ 1/* $OpenBSD: ocsp_prn.c,v 1.10 2023/07/08 10:44:00 beck Exp $ */
2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL 2/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
3 * project. */ 3 * project. */
4 4
@@ -114,6 +114,7 @@ OCSP_response_status_str(long s)
114 }; 114 };
115 return table2string(s, rstat_tbl, 6); 115 return table2string(s, rstat_tbl, 6);
116} 116}
117LCRYPTO_ALIAS(OCSP_response_status_str);
117 118
118const char * 119const char *
119OCSP_cert_status_str(long s) 120OCSP_cert_status_str(long s)
@@ -125,6 +126,7 @@ OCSP_cert_status_str(long s)
125 }; 126 };
126 return table2string(s, cstat_tbl, 3); 127 return table2string(s, cstat_tbl, 3);
127} 128}
129LCRYPTO_ALIAS(OCSP_cert_status_str);
128 130
129const char * 131const char *
130OCSP_crl_reason_str(long s) 132OCSP_crl_reason_str(long s)
@@ -141,6 +143,7 @@ OCSP_crl_reason_str(long s)
141 }; 143 };
142 return table2string(s, reason_tbl, 8); 144 return table2string(s, reason_tbl, 8);
143} 145}
146LCRYPTO_ALIAS(OCSP_crl_reason_str);
144 147
145int 148int
146OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags) 149OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags)
@@ -192,6 +195,7 @@ OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags)
192err: 195err:
193 return 0; 196 return 0;
194} 197}
198LCRYPTO_ALIAS(OCSP_REQUEST_print);
195 199
196int 200int
197OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags) 201OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
@@ -312,3 +316,4 @@ err:
312 OCSP_BASICRESP_free(br); 316 OCSP_BASICRESP_free(br);
313 return ret; 317 return ret;
314} 318}
319LCRYPTO_ALIAS(OCSP_RESPONSE_print);
diff --git a/src/lib/libcrypto/ocsp/ocsp_srv.c b/src/lib/libcrypto/ocsp/ocsp_srv.c
index d23520708c..77c5e2e0fd 100644
--- a/src/lib/libcrypto/ocsp/ocsp_srv.c
+++ b/src/lib/libcrypto/ocsp/ocsp_srv.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_srv.c,v 1.12 2022/01/07 09:45:52 tb Exp $ */ 1/* $OpenBSD: ocsp_srv.c,v 1.13 2023/07/08 10:44:00 beck 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 */
@@ -76,18 +76,21 @@ OCSP_request_onereq_count(OCSP_REQUEST *req)
76{ 76{
77 return sk_OCSP_ONEREQ_num(req->tbsRequest->requestList); 77 return sk_OCSP_ONEREQ_num(req->tbsRequest->requestList);
78} 78}
79LCRYPTO_ALIAS(OCSP_request_onereq_count);
79 80
80OCSP_ONEREQ * 81OCSP_ONEREQ *
81OCSP_request_onereq_get0(OCSP_REQUEST *req, int i) 82OCSP_request_onereq_get0(OCSP_REQUEST *req, int i)
82{ 83{
83 return sk_OCSP_ONEREQ_value(req->tbsRequest->requestList, i); 84 return sk_OCSP_ONEREQ_value(req->tbsRequest->requestList, i);
84} 85}
86LCRYPTO_ALIAS(OCSP_request_onereq_get0);
85 87
86OCSP_CERTID * 88OCSP_CERTID *
87OCSP_onereq_get0_id(OCSP_ONEREQ *one) 89OCSP_onereq_get0_id(OCSP_ONEREQ *one)
88{ 90{
89 return one->reqCert; 91 return one->reqCert;
90} 92}
93LCRYPTO_ALIAS(OCSP_onereq_get0_id);
91 94
92int 95int
93OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, 96OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
@@ -105,6 +108,7 @@ OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
105 *pserial = cid->serialNumber; 108 *pserial = cid->serialNumber;
106 return 1; 109 return 1;
107} 110}
111LCRYPTO_ALIAS(OCSP_id_get0_info);
108 112
109int 113int
110OCSP_request_is_signed(OCSP_REQUEST *req) 114OCSP_request_is_signed(OCSP_REQUEST *req)
@@ -113,6 +117,7 @@ OCSP_request_is_signed(OCSP_REQUEST *req)
113 return 1; 117 return 1;
114 return 0; 118 return 0;
115} 119}
120LCRYPTO_ALIAS(OCSP_request_is_signed);
116 121
117/* Create an OCSP response and encode an optional basic response */ 122/* Create an OCSP response and encode an optional basic response */
118OCSP_RESPONSE * 123OCSP_RESPONSE *
@@ -139,6 +144,7 @@ err:
139 OCSP_RESPONSE_free(rsp); 144 OCSP_RESPONSE_free(rsp);
140 return NULL; 145 return NULL;
141} 146}
147LCRYPTO_ALIAS(OCSP_response_create);
142 148
143OCSP_SINGLERESP * 149OCSP_SINGLERESP *
144OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_CERTID *cid, int status, 150OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_CERTID *cid, int status,
@@ -205,6 +211,7 @@ err:
205 OCSP_SINGLERESP_free(single); 211 OCSP_SINGLERESP_free(single);
206 return NULL; 212 return NULL;
207} 213}
214LCRYPTO_ALIAS(OCSP_basic_add1_status);
208 215
209/* Add a certificate to an OCSP request */ 216/* Add a certificate to an OCSP request */
210int 217int
@@ -218,6 +225,7 @@ OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert)
218 X509_up_ref(cert); 225 X509_up_ref(cert);
219 return 1; 226 return 1;
220} 227}
228LCRYPTO_ALIAS(OCSP_basic_add1_cert);
221 229
222int 230int
223OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key, 231OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key,
@@ -274,3 +282,4 @@ OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key,
274err: 282err:
275 return 0; 283 return 0;
276} 284}
285LCRYPTO_ALIAS(OCSP_basic_sign);
diff --git a/src/lib/libcrypto/ocsp/ocsp_vfy.c b/src/lib/libcrypto/ocsp/ocsp_vfy.c
index 3c12318857..d197fe4ea7 100644
--- a/src/lib/libcrypto/ocsp/ocsp_vfy.c
+++ b/src/lib/libcrypto/ocsp/ocsp_vfy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp_vfy.c,v 1.22 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: ocsp_vfy.c,v 1.23 2023/07/08 10:44:00 beck 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 2000. 3 * project 2000.
4 */ 4 */
@@ -183,6 +183,7 @@ end:
183 sk_X509_free(untrusted); 183 sk_X509_free(untrusted);
184 return ret; 184 return ret;
185} 185}
186LCRYPTO_ALIAS(OCSP_basic_verify);
186 187
187int 188int
188OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer, 189OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer,
@@ -190,6 +191,7 @@ OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer,
190{ 191{
191 return ocsp_find_signer(signer, bs, extra_certs, NULL, 0) > 0; 192 return ocsp_find_signer(signer, bs, extra_certs, NULL, 0) > 0;
192} 193}
194LCRYPTO_ALIAS(OCSP_resp_get0_signer);
193 195
194static int 196static int
195ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs, STACK_OF(X509) *certs, 197ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
@@ -448,6 +450,7 @@ OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs, X509_STORE *store,
448 } 450 }
449 return 1; 451 return 1;
450} 452}
453LCRYPTO_ALIAS(OCSP_request_verify);
451 454
452static int 455static int
453ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req, X509_NAME *nm, 456ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req, X509_NAME *nm,
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 02:07:40 +0000