diff options
| author | beck <> | 2023-07-07 19:37:54 +0000 |
|---|---|---|
| committer | beck <> | 2023-07-07 19:37:54 +0000 |
| commit | 1ca8095297adf80b48019b5a2d18010ff9e3427f (patch) | |
| tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/x_algor.c | |
| parent | 66ac57d506be0af957abeb5a5a7334a8d2a36c9b (diff) | |
| download | openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.gz openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.bz2 openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.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 '')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_algor.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c index 8d9f9c4752..0f1cd9cb65 100644 --- a/src/lib/libcrypto/asn1/x_algor.c +++ b/src/lib/libcrypto/asn1/x_algor.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_algor.c,v 1.24 2023/07/05 21:23:37 beck Exp $ */ | 1 | /* $OpenBSD: x_algor.c,v 1.25 2023/07/07 19:37:52 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 | */ |
| @@ -109,28 +109,24 @@ d2i_X509_ALGOR(X509_ALGOR **a, const unsigned char **in, long len) | |||
| 109 | return (X509_ALGOR *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 109 | return (X509_ALGOR *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 110 | &X509_ALGOR_it); | 110 | &X509_ALGOR_it); |
| 111 | } | 111 | } |
| 112 | LCRYPTO_ALIAS(d2i_X509_ALGOR); | ||
| 113 | 112 | ||
| 114 | int | 113 | int |
| 115 | i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **out) | 114 | i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **out) |
| 116 | { | 115 | { |
| 117 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGOR_it); | 116 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGOR_it); |
| 118 | } | 117 | } |
| 119 | LCRYPTO_ALIAS(i2d_X509_ALGOR); | ||
| 120 | 118 | ||
| 121 | X509_ALGOR * | 119 | X509_ALGOR * |
| 122 | X509_ALGOR_new(void) | 120 | X509_ALGOR_new(void) |
| 123 | { | 121 | { |
| 124 | return (X509_ALGOR *)ASN1_item_new(&X509_ALGOR_it); | 122 | return (X509_ALGOR *)ASN1_item_new(&X509_ALGOR_it); |
| 125 | } | 123 | } |
| 126 | LCRYPTO_ALIAS(X509_ALGOR_new); | ||
| 127 | 124 | ||
| 128 | void | 125 | void |
| 129 | X509_ALGOR_free(X509_ALGOR *a) | 126 | X509_ALGOR_free(X509_ALGOR *a) |
| 130 | { | 127 | { |
| 131 | ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it); | 128 | ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it); |
| 132 | } | 129 | } |
| 133 | LCRYPTO_ALIAS(X509_ALGOR_free); | ||
| 134 | 130 | ||
| 135 | X509_ALGORS * | 131 | X509_ALGORS * |
| 136 | d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len) | 132 | d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len) |
| @@ -138,21 +134,18 @@ d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len) | |||
| 138 | return (X509_ALGORS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 134 | return (X509_ALGORS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
| 139 | &X509_ALGORS_it); | 135 | &X509_ALGORS_it); |
| 140 | } | 136 | } |
| 141 | LCRYPTO_ALIAS(d2i_X509_ALGORS); | ||
| 142 | 137 | ||
| 143 | int | 138 | int |
| 144 | i2d_X509_ALGORS(X509_ALGORS *a, unsigned char **out) | 139 | i2d_X509_ALGORS(X509_ALGORS *a, unsigned char **out) |
| 145 | { | 140 | { |
| 146 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGORS_it); | 141 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGORS_it); |
| 147 | } | 142 | } |
| 148 | LCRYPTO_ALIAS(i2d_X509_ALGORS); | ||
| 149 | 143 | ||
| 150 | X509_ALGOR * | 144 | X509_ALGOR * |
| 151 | X509_ALGOR_dup(X509_ALGOR *x) | 145 | X509_ALGOR_dup(X509_ALGOR *x) |
| 152 | { | 146 | { |
| 153 | return ASN1_item_dup(&X509_ALGOR_it, x); | 147 | return ASN1_item_dup(&X509_ALGOR_it, x); |
| 154 | } | 148 | } |
| 155 | LCRYPTO_ALIAS(X509_ALGOR_dup); | ||
| 156 | 149 | ||
| 157 | int | 150 | int |
| 158 | X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval) | 151 | X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval) |
| @@ -181,7 +174,6 @@ X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval) | |||
| 181 | ASN1_TYPE_set(alg->parameter, ptype, pval); | 174 | ASN1_TYPE_set(alg->parameter, ptype, pval); |
| 182 | return 1; | 175 | return 1; |
| 183 | } | 176 | } |
| 184 | LCRYPTO_ALIAS(X509_ALGOR_set0); | ||
| 185 | 177 | ||
| 186 | void | 178 | void |
| 187 | X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype, const void **ppval, | 179 | X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype, const void **ppval, |
| @@ -199,7 +191,6 @@ X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype, const void **ppval, | |||
| 199 | *ppval = algor->parameter->value.ptr; | 191 | *ppval = algor->parameter->value.ptr; |
| 200 | } | 192 | } |
| 201 | } | 193 | } |
| 202 | LCRYPTO_ALIAS(X509_ALGOR_get0); | ||
| 203 | 194 | ||
| 204 | /* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */ | 195 | /* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */ |
| 205 | 196 | ||
| @@ -213,7 +204,6 @@ X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md) | |||
| 213 | 204 | ||
| 214 | X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL); | 205 | X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL); |
| 215 | } | 206 | } |
| 216 | LCRYPTO_ALIAS(X509_ALGOR_set_md); | ||
| 217 | 207 | ||
| 218 | /* Returns 0 if they are equal, != 0 otherwise. */ | 208 | /* Returns 0 if they are equal, != 0 otherwise. */ |
| 219 | int | 209 | int |
| @@ -228,4 +218,3 @@ X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b) | |||
| 228 | } | 218 | } |
| 229 | return(rv); | 219 | return(rv); |
| 230 | } | 220 | } |
| 231 | LCRYPTO_ALIAS(X509_ALGOR_cmp); | ||
