diff options
author | beck <> | 2023-07-07 19:37:54 +0000 |
---|---|---|
committer | beck <> | 2023-07-07 19:37:54 +0000 |
commit | 8d42940c1d19bb9bd4ce45580f18a59069225432 (patch) | |
tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/cipher_method_lib.c | |
parent | 1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff) | |
download | openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2 openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.zip |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/evp/cipher_method_lib.c')
-rw-r--r-- | src/lib/libcrypto/evp/cipher_method_lib.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libcrypto/evp/cipher_method_lib.c b/src/lib/libcrypto/evp/cipher_method_lib.c index 9e4fd483a3..c3f510fcc7 100644 --- a/src/lib/libcrypto/evp/cipher_method_lib.c +++ b/src/lib/libcrypto/evp/cipher_method_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher_method_lib.c,v 1.9 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: cipher_method_lib.c,v 1.10 2023/07/07 19:37:53 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project | 3 | * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project |
4 | * 2015. | 4 | * 2015. |
@@ -77,7 +77,6 @@ EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len) | |||
77 | 77 | ||
78 | return cipher; | 78 | return cipher; |
79 | } | 79 | } |
80 | LCRYPTO_ALIAS(EVP_CIPHER_meth_new); | ||
81 | 80 | ||
82 | EVP_CIPHER * | 81 | EVP_CIPHER * |
83 | EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) | 82 | EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) |
@@ -91,14 +90,12 @@ EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher) | |||
91 | 90 | ||
92 | return copy; | 91 | return copy; |
93 | } | 92 | } |
94 | LCRYPTO_ALIAS(EVP_CIPHER_meth_dup); | ||
95 | 93 | ||
96 | void | 94 | void |
97 | EVP_CIPHER_meth_free(EVP_CIPHER *cipher) | 95 | EVP_CIPHER_meth_free(EVP_CIPHER *cipher) |
98 | { | 96 | { |
99 | free(cipher); | 97 | free(cipher); |
100 | } | 98 | } |
101 | LCRYPTO_ALIAS(EVP_CIPHER_meth_free); | ||
102 | 99 | ||
103 | int | 100 | int |
104 | EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len) | 101 | EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len) |
@@ -107,7 +104,6 @@ EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len) | |||
107 | 104 | ||
108 | return 1; | 105 | return 1; |
109 | } | 106 | } |
110 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_iv_length); | ||
111 | 107 | ||
112 | int | 108 | int |
113 | EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags) | 109 | EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags) |
@@ -116,7 +112,6 @@ EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags) | |||
116 | 112 | ||
117 | return 1; | 113 | return 1; |
118 | } | 114 | } |
119 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_flags); | ||
120 | 115 | ||
121 | int | 116 | int |
122 | EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size) | 117 | EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size) |
@@ -125,7 +120,6 @@ EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size) | |||
125 | 120 | ||
126 | return 1; | 121 | return 1; |
127 | } | 122 | } |
128 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_impl_ctx_size); | ||
129 | 123 | ||
130 | int | 124 | int |
131 | EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, | 125 | EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, |
@@ -136,7 +130,6 @@ EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher, | |||
136 | 130 | ||
137 | return 1; | 131 | return 1; |
138 | } | 132 | } |
139 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_init); | ||
140 | 133 | ||
141 | int | 134 | int |
142 | EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, | 135 | EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, |
@@ -147,7 +140,6 @@ EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher, | |||
147 | 140 | ||
148 | return 1; | 141 | return 1; |
149 | } | 142 | } |
150 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_do_cipher); | ||
151 | 143 | ||
152 | int | 144 | int |
153 | EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, | 145 | EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, |
@@ -157,7 +149,6 @@ EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher, | |||
157 | 149 | ||
158 | return 1; | 150 | return 1; |
159 | } | 151 | } |
160 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_cleanup); | ||
161 | 152 | ||
162 | int | 153 | int |
163 | EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, | 154 | EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, |
@@ -167,7 +158,6 @@ EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher, | |||
167 | 158 | ||
168 | return 1; | 159 | return 1; |
169 | } | 160 | } |
170 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_set_asn1_params); | ||
171 | 161 | ||
172 | int | 162 | int |
173 | EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, | 163 | EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, |
@@ -177,7 +167,6 @@ EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher, | |||
177 | 167 | ||
178 | return 1; | 168 | return 1; |
179 | } | 169 | } |
180 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_get_asn1_params); | ||
181 | 170 | ||
182 | int | 171 | int |
183 | EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, | 172 | EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, |
@@ -187,4 +176,3 @@ EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher, | |||
187 | 176 | ||
188 | return 1; | 177 | return 1; |
189 | } | 178 | } |
190 | LCRYPTO_ALIAS(EVP_CIPHER_meth_set_ctrl); | ||