diff options
| author | beck <> | 2023-07-07 13:54:46 +0000 |
|---|---|---|
| committer | beck <> | 2023-07-07 13:54:46 +0000 |
| commit | f9fcde20a6214da85e802190ccd3a2bf5f891559 (patch) | |
| tree | 8637b2fb4bca234d55b598e035f23335be46ce49 /src/lib/libcrypto/evp/evp_pkey.c | |
| parent | 96c313e4aac4001ae9818efee3f34856cdf873b0 (diff) | |
| download | openbsd-f9fcde20a6214da85e802190ccd3a2bf5f891559.tar.gz openbsd-f9fcde20a6214da85e802190ccd3a2bf5f891559.tar.bz2 openbsd-f9fcde20a6214da85e802190ccd3a2bf5f891559.zip | |
Hide symbols in hkdf, evp, err, ecdsa, and ec
(part 2 of commit)
ok jsing@
Diffstat (limited to 'src/lib/libcrypto/evp/evp_pkey.c')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_pkey.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c index d2fbdee46c..31a59e2536 100644 --- a/src/lib/libcrypto/evp/evp_pkey.c +++ b/src/lib/libcrypto/evp/evp_pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_pkey.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */ | 1 | /* $OpenBSD: evp_pkey.c,v 1.26 2023/07/07 13:54:45 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -105,6 +105,7 @@ error: | |||
| 105 | EVP_PKEY_free(pkey); | 105 | EVP_PKEY_free(pkey); |
| 106 | return NULL; | 106 | return NULL; |
| 107 | } | 107 | } |
| 108 | LCRYPTO_ALIAS(EVP_PKCS82PKEY); | ||
| 108 | 109 | ||
| 109 | /* Turn a private key into a PKCS8 structure */ | 110 | /* Turn a private key into a PKCS8 structure */ |
| 110 | 111 | ||
| @@ -138,6 +139,7 @@ error: | |||
| 138 | PKCS8_PRIV_KEY_INFO_free(p8); | 139 | PKCS8_PRIV_KEY_INFO_free(p8); |
| 139 | return NULL; | 140 | return NULL; |
| 140 | } | 141 | } |
| 142 | LCRYPTO_ALIAS(EVP_PKEY2PKCS8); | ||
| 141 | 143 | ||
| 142 | /* EVP_PKEY attribute functions */ | 144 | /* EVP_PKEY attribute functions */ |
| 143 | 145 | ||
| @@ -146,12 +148,14 @@ EVP_PKEY_get_attr_count(const EVP_PKEY *key) | |||
| 146 | { | 148 | { |
| 147 | return X509at_get_attr_count(key->attributes); | 149 | return X509at_get_attr_count(key->attributes); |
| 148 | } | 150 | } |
| 151 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_count); | ||
| 149 | 152 | ||
| 150 | int | 153 | int |
| 151 | EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) | 154 | EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) |
| 152 | { | 155 | { |
| 153 | return X509at_get_attr_by_NID(key->attributes, nid, lastpos); | 156 | return X509at_get_attr_by_NID(key->attributes, nid, lastpos); |
| 154 | } | 157 | } |
| 158 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID); | ||
| 155 | 159 | ||
| 156 | int | 160 | int |
| 157 | EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, | 161 | EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, |
| @@ -159,18 +163,21 @@ EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, | |||
| 159 | { | 163 | { |
| 160 | return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); | 164 | return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); |
| 161 | } | 165 | } |
| 166 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ); | ||
| 162 | 167 | ||
| 163 | X509_ATTRIBUTE * | 168 | X509_ATTRIBUTE * |
| 164 | EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) | 169 | EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) |
| 165 | { | 170 | { |
| 166 | return X509at_get_attr(key->attributes, loc); | 171 | return X509at_get_attr(key->attributes, loc); |
| 167 | } | 172 | } |
| 173 | LCRYPTO_ALIAS(EVP_PKEY_get_attr); | ||
| 168 | 174 | ||
| 169 | X509_ATTRIBUTE * | 175 | X509_ATTRIBUTE * |
| 170 | EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) | 176 | EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) |
| 171 | { | 177 | { |
| 172 | return X509at_delete_attr(key->attributes, loc); | 178 | return X509at_delete_attr(key->attributes, loc); |
| 173 | } | 179 | } |
| 180 | LCRYPTO_ALIAS(EVP_PKEY_delete_attr); | ||
| 174 | 181 | ||
| 175 | int | 182 | int |
| 176 | EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) | 183 | EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) |
| @@ -179,6 +186,7 @@ EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) | |||
| 179 | return 1; | 186 | return 1; |
| 180 | return 0; | 187 | return 0; |
| 181 | } | 188 | } |
| 189 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr); | ||
| 182 | 190 | ||
| 183 | int | 191 | int |
| 184 | EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, | 192 | EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, |
| @@ -188,6 +196,7 @@ EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, | |||
| 188 | return 1; | 196 | return 1; |
| 189 | return 0; | 197 | return 0; |
| 190 | } | 198 | } |
| 199 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ); | ||
| 191 | 200 | ||
| 192 | int | 201 | int |
| 193 | EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, | 202 | EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, |
| @@ -197,6 +206,7 @@ EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, | |||
| 197 | return 1; | 206 | return 1; |
| 198 | return 0; | 207 | return 0; |
| 199 | } | 208 | } |
| 209 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID); | ||
| 200 | 210 | ||
| 201 | int | 211 | int |
| 202 | EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, | 212 | EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, |
| @@ -207,3 +217,4 @@ EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, | |||
| 207 | return 1; | 217 | return 1; |
| 208 | return 0; | 218 | return 0; |
| 209 | } | 219 | } |
| 220 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt); | ||
