summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-08-16 21:25:08 +0200
committerRichard Levitte <levitte@openssl.org>2020-08-21 09:23:58 +0200
commitece9304c96f71277ca95696d9bc49fdec51e9f17 (patch)
tree7038f8760e1538754bc67371cb5a466a83935dad
parentf650993f1de3dbb5eda9009ad0c4895a7b1b7fe2 (diff)
Rename OSSL_SERIALIZER / OSSL_DESERIALIZER to OSSL_ENCODE / OSSL_DECODE
Fixes #12455 Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12660)
-rw-r--r--CHANGES.md30
-rw-r--r--NEWS.md2
-rw-r--r--apps/list.c139
-rw-r--r--crypto/asn1/i2d_pr.c14
-rw-r--r--crypto/build.info2
-rw-r--r--crypto/encode_decode/build.info8
-rw-r--r--crypto/encode_decode/decoder_err.c (renamed from crypto/serializer/deserializer_err.c)14
-rw-r--r--crypto/encode_decode/decoder_lib.c483
-rw-r--r--crypto/encode_decode/decoder_meth.c552
-rw-r--r--crypto/encode_decode/decoder_pkey.c (renamed from crypto/serializer/deserializer_pkey.c)141
-rw-r--r--crypto/encode_decode/encoder_err.c33
-rw-r--r--crypto/encode_decode/encoder_lib.c (renamed from crypto/serializer/serializer_lib.c)12
-rw-r--r--crypto/encode_decode/encoder_local.h140
-rw-r--r--crypto/encode_decode/encoder_meth.c523
-rw-r--r--crypto/encode_decode/encoder_pkey.c276
-rw-r--r--crypto/encode_decode/endecode_pass.c (renamed from crypto/serializer/serdes_pass.c)34
-rw-r--r--crypto/err/err.c4
-rw-r--r--crypto/err/openssl.ec12
-rw-r--r--crypto/err/openssl.txt6
-rw-r--r--crypto/evp/p_lib.c20
-rw-r--r--crypto/evp/pmeth_gn.c1
-rw-r--r--crypto/pem/pem_local.h38
-rw-r--r--crypto/pem/pem_pk8.c23
-rw-r--r--crypto/pem/pem_pkey.c1
-rw-r--r--crypto/property/property_parse.c6
-rw-r--r--crypto/serializer/build.info8
-rw-r--r--crypto/serializer/deserializer_lib.c488
-rw-r--r--crypto/serializer/deserializer_meth.c552
-rw-r--r--crypto/serializer/serializer_err.c33
-rw-r--r--crypto/serializer/serializer_local.h140
-rw-r--r--crypto/serializer/serializer_meth.c522
-rw-r--r--crypto/serializer/serializer_pkey.c275
-rw-r--r--crypto/x509/x_pubkey.c26
-rw-r--r--doc/man1/openssl-list.pod.in12
-rw-r--r--doc/man3/OSSL_DECODER.pod142
-rw-r--r--doc/man3/OSSL_DECODER_CTX.pod74
-rw-r--r--doc/man3/OSSL_DECODER_CTX_new_by_EVP_PKEY.pod109
-rw-r--r--doc/man3/OSSL_DECODER_from_bio.pod276
-rw-r--r--doc/man3/OSSL_DESERIALIZER.pod146
-rw-r--r--doc/man3/OSSL_DESERIALIZER_CTX.pod74
-rw-r--r--doc/man3/OSSL_DESERIALIZER_CTX_new_by_EVP_PKEY.pod111
-rw-r--r--doc/man3/OSSL_DESERIALIZER_from_bio.pod280
-rw-r--r--doc/man3/OSSL_ENCODER.pod126
-rw-r--r--doc/man3/OSSL_ENCODER_CTX.pod93
-rw-r--r--doc/man3/OSSL_ENCODER_CTX_new_by_EVP_PKEY.pod144
-rw-r--r--doc/man3/OSSL_ENCODER_to_bio.pod (renamed from doc/man3/OSSL_SERIALIZER_to_bio.pod)24
-rw-r--r--doc/man3/OSSL_SERIALIZER.pod129
-rw-r--r--doc/man3/OSSL_SERIALIZER_CTX.pod94
-rw-r--r--doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod144
-rw-r--r--doc/man7/OSSL_PROVIDER-FIPS.pod2
-rw-r--r--doc/man7/OSSL_PROVIDER-base.pod22
-rw-r--r--doc/man7/OSSL_PROVIDER-default.pod16
-rw-r--r--doc/man7/provider-encoder.pod (renamed from doc/man7/provider-serializer.pod)127
-rw-r--r--doc/man7/provider.pod10
-rw-r--r--include/crypto/encoder.h (renamed from include/crypto/serializer.h)8
-rw-r--r--include/internal/cryptlib.h4
-rw-r--r--include/openssl/core_dispatch.h62
-rw-r--r--include/openssl/core_names.h26
-rw-r--r--include/openssl/decoder.h117
-rw-r--r--include/openssl/decodererr.h (renamed from include/openssl/deserializererr.h)12
-rw-r--r--include/openssl/deserializer.h125
-rw-r--r--include/openssl/encoder.h100
-rw-r--r--include/openssl/encodererr.h (renamed from include/openssl/serializererr.h)14
-rw-r--r--include/openssl/err.h4
-rw-r--r--include/openssl/serializer.h104
-rw-r--r--include/openssl/types.h8
-rw-r--r--providers/baseprov.c24
-rw-r--r--providers/decoders.inc42
-rw-r--r--providers/defltprov.c24
-rw-r--r--providers/deserializers.inc42
-rw-r--r--providers/encoders.inc112
-rw-r--r--providers/implementations/build.info2
-rw-r--r--providers/implementations/encode_decode/build.info35
-rw-r--r--providers/implementations/encode_decode/decode_common.c (renamed from providers/implementations/serializers/deserialize_common.c)2
-rw-r--r--providers/implementations/encode_decode/decode_der2key.c (renamed from providers/implementations/serializers/deserialize_der2key.c)46
-rw-r--r--providers/implementations/encode_decode/decode_ms2key.c (renamed from providers/implementations/serializers/deserialize_ms2key.c)64
-rw-r--r--providers/implementations/encode_decode/decode_pem2der.c (renamed from providers/implementations/serializers/deserialize_pem2der.c)40
-rw-r--r--providers/implementations/encode_decode/encoder_common.c (renamed from providers/implementations/serializers/serializer_common.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_dh.c (renamed from providers/implementations/serializers/serializer_dh.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_dh_param.c (renamed from providers/implementations/serializers/serializer_dh_param.c)52
-rw-r--r--providers/implementations/encode_decode/encoder_dh_priv.c (renamed from providers/implementations/serializers/serializer_dh_priv.c)86
-rw-r--r--providers/implementations/encode_decode/encoder_dh_pub.c (renamed from providers/implementations/serializers/serializer_dh_pub.c)58
-rw-r--r--providers/implementations/encode_decode/encoder_dsa.c (renamed from providers/implementations/serializers/serializer_dsa.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_dsa_param.c (renamed from providers/implementations/serializers/serializer_dsa_param.c)48
-rw-r--r--providers/implementations/encode_decode/encoder_dsa_priv.c (renamed from providers/implementations/serializers/serializer_dsa_priv.c)84
-rw-r--r--providers/implementations/encode_decode/encoder_dsa_pub.c (renamed from providers/implementations/serializers/serializer_dsa_pub.c)48
-rw-r--r--providers/implementations/encode_decode/encoder_ec.c (renamed from providers/implementations/serializers/serializer_ec.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_ec_param.c (renamed from providers/implementations/serializers/serializer_ec_param.c)54
-rw-r--r--providers/implementations/encode_decode/encoder_ec_priv.c (renamed from providers/implementations/serializers/serializer_ec_priv.c)90
-rw-r--r--providers/implementations/encode_decode/encoder_ec_pub.c (renamed from providers/implementations/serializers/serializer_ec_pub.c)49
-rw-r--r--providers/implementations/encode_decode/encoder_ecx.c (renamed from providers/implementations/serializers/serializer_ecx.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_ecx_priv.c (renamed from providers/implementations/serializers/serializer_ecx_priv.c)108
-rw-r--r--providers/implementations/encode_decode/encoder_ecx_pub.c (renamed from providers/implementations/serializers/serializer_ecx_pub.c)60
-rw-r--r--providers/implementations/encode_decode/encoder_ffc_params.c (renamed from providers/implementations/serializers/serializer_ffc_params.c)2
-rw-r--r--providers/implementations/encode_decode/encoder_local.h (renamed from providers/implementations/serializers/serializer_local.h)2
-rw-r--r--providers/implementations/encode_decode/encoder_rsa.c (renamed from providers/implementations/serializers/serializer_rsa.c)4
-rw-r--r--providers/implementations/encode_decode/encoder_rsa_priv.c (renamed from providers/implementations/serializers/serializer_rsa_priv.c)84
-rw-r--r--providers/implementations/encode_decode/encoder_rsa_pub.c (renamed from providers/implementations/serializers/serializer_rsa_pub.c)48
-rw-r--r--providers/implementations/include/prov/implementations.h146
-rw-r--r--providers/implementations/serializers/build.info35
-rw-r--r--providers/serializers.inc112
-rw-r--r--test/build.info8
-rw-r--r--test/endecode_test.c (renamed from test/serdes_test.c)230
-rw-r--r--test/evp_pkey_provided_test.c60
-rw-r--r--test/recipes/04-test_encoder_decoder.t (renamed from test/recipes/04-test_serializer_deserializer.t)4
-rw-r--r--util/libcrypto.num114
-rw-r--r--util/missingcrypto.txt16
-rw-r--r--util/other.syms36
108 files changed, 4669 insertions, 4709 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 31e183f395..c2bbf0d167 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -612,22 +612,22 @@ OpenSSL 3.0
*Rich Salz*
- * Introduced a new method type and API, OSSL_SERIALIZER, to
- represent generic serializers. An implementation is expected to
- be able to serialize an object associated with a given name (such
+ * Introduced a new method type and API, OSSL_ENCODER, to
+ represent generic encoders. An implementation is expected to
+ be able to encode an object associated with a given name (such
as an algorithm name for an asymmetric key) into forms given by
implementation properties.
- Serializers are primarily used from inside libcrypto, through
+ Encoders are primarily used from inside libcrypto, through
calls to functions like EVP_PKEY_print_private(),
PEM_write_bio_PrivateKey() and similar.
- Serializers are specified in such a way that they can be made to
+ Encoders are specified in such a way that they can be made to
directly handle the provider side portion of an object, if this
- provider side part comes from the same provider as the serializer
+ provider side part comes from the same provider as the encoder
itself, but can also be made to handle objects in parametrized
form (as an OSSL_PARAM array of data). This allows a provider to
- offer generic serializers as a service for any other provider.
+ offer generic encoders as a service for any other provider.
*Richard Levitte*
@@ -769,13 +769,13 @@ OpenSSL 3.0
*Richard Levitte*
* For built-in EC curves, ensure an EC_GROUP built from the curve name is
- used even when parsing explicit parameters, when loading a serialized key
+ used even when parsing explicit parameters, when loading a encoded key
or calling `EC_GROUP_new_from_ecpkparameters()`/
`EC_GROUP_new_from_ecparameters()`.
This prevents bypass of security hardening and performance gains,
especially for curves with specialized EC_METHODs.
By default, if a key encoded with explicit parameters is loaded and later
- serialized, the output is still encoded with explicit parameters, even if
+ encoded, the output is still encoded with explicit parameters, even if
internally a "named" EC_GROUP is used for computation.
*Nicola Tuveri*
@@ -1255,13 +1255,13 @@ OpenSSL 1.1.1
*Matthias St. Pierre*
* For built-in EC curves, ensure an EC_GROUP built from the curve name is
- used even when parsing explicit parameters, when loading a serialized key
+ used even when parsing explicit parameters, when loading a encoded key
or calling `EC_GROUP_new_from_ecpkparameters()`/
`EC_GROUP_new_from_ecparameters()`.
This prevents bypass of security hardening and performance gains,
especially for curves with specialized EC_METHODs.
By default, if a key encoded with explicit parameters is loaded and later
- serialized, the output is still encoded with explicit parameters, even if
+ encoded, the output is still encoded with explicit parameters, even if
internally a "named" EC_GROUP is used for computation.
*Nicola Tuveri*
@@ -2025,13 +2025,13 @@ OpenSSL 1.1.0
### Changes between 1.1.0k and 1.1.0l [10 Sep 2019]
* For built-in EC curves, ensure an EC_GROUP built from the curve name is
- used even when parsing explicit parameters, when loading a serialized key
+ used even when parsing explicit parameters, when loading a encoded key
or calling `EC_GROUP_new_from_ecpkparameters()`/
`EC_GROUP_new_from_ecparameters()`.
This prevents bypass of security hardening and performance gains,
especially for curves with specialized EC_METHODs.
By default, if a key encoded with explicit parameters is loaded and later
- serialized, the output is still encoded with explicit parameters, even if
+ encoded, the output is still encoded with explicit parameters, even if
internally a "named" EC_GROUP is used for computation.
*Nicola Tuveri*
@@ -3822,13 +3822,13 @@ OpenSSL 1.0.2
### Changes between 1.0.2s and 1.0.2t [10 Sep 2019]
* For built-in EC curves, ensure an EC_GROUP built from the curve name is
- used even when parsing explicit parameters, when loading a serialized key
+ used even when parsing explicit parameters, when loading a encoded key
or calling `EC_GROUP_new_from_ecpkparameters()`/
`EC_GROUP_new_from_ecparameters()`.
This prevents bypass of security hardening and performance gains,
especially for curves with spec