diff options
author | tb <> | 2018-08-24 20:07:42 +0000 |
---|---|---|
committer | tb <> | 2018-08-24 20:07:42 +0000 |
commit | 41189be79309f39d1bf45f50b75751b6ac97529c (patch) | |
tree | a927084dd419f630a1ec6130a8df811d9d3bf37f /src/lib/libcrypto/Symbols.list | |
parent | 7e3bb11deae929ede0edfffa60cf9dc2d6be0b51 (diff) | |
download | openbsd-41189be79309f39d1bf45f50b75751b6ac97529c.tar.gz openbsd-41189be79309f39d1bf45f50b75751b6ac97529c.tar.bz2 openbsd-41189be79309f39d1bf45f50b75751b6ac97529c.zip |
Remove EVP_PKEY2PKCS8_broken() and PKCS8_set_broken()
Provide PKCS8_pkey_add1_attr_by_NID() and PKCS8_pkey_get0_attrs().
Remove the whole broken code and simplify pkcs8_priv_key_info_st
accordingly. Based on OpenSSL commit
54dbf42398e23349b59f258a3dd60387bbc5ba13 plus some const that was
added later.
tested in a bulk build by sthen
ok jsing
Diffstat (limited to 'src/lib/libcrypto/Symbols.list')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 191e967e34..ea5c93995b 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -1350,7 +1350,6 @@ EVP_PBE_cleanup | |||
1350 | EVP_PBE_find | 1350 | EVP_PBE_find |
1351 | EVP_PKCS82PKEY | 1351 | EVP_PKCS82PKEY |
1352 | EVP_PKEY2PKCS8 | 1352 | EVP_PKEY2PKCS8 |
1353 | EVP_PKEY2PKCS8_broken | ||
1354 | EVP_PKEY_CTX_ctrl | 1353 | EVP_PKEY_CTX_ctrl |
1355 | EVP_PKEY_CTX_ctrl_str | 1354 | EVP_PKEY_CTX_ctrl_str |
1356 | EVP_PKEY_CTX_dup | 1355 | EVP_PKEY_CTX_dup |
@@ -2193,9 +2192,10 @@ PKCS8_PRIV_KEY_INFO_new | |||
2193 | PKCS8_add_keyusage | 2192 | PKCS8_add_keyusage |
2194 | PKCS8_decrypt | 2193 | PKCS8_decrypt |
2195 | PKCS8_encrypt | 2194 | PKCS8_encrypt |
2195 | PKCS8_pkey_add1_attr_by_NID | ||
2196 | PKCS8_pkey_get0 | 2196 | PKCS8_pkey_get0 |
2197 | PKCS8_pkey_get0_attrs | ||
2197 | PKCS8_pkey_set0 | 2198 | PKCS8_pkey_set0 |
2198 | PKCS8_set_broken | ||
2199 | PKEY_USAGE_PERIOD_free | 2199 | PKEY_USAGE_PERIOD_free |
2200 | PKEY_USAGE_PERIOD_it | 2200 | PKEY_USAGE_PERIOD_it |
2201 | PKEY_USAGE_PERIOD_new | 2201 | PKEY_USAGE_PERIOD_new |