diff options
Diffstat (limited to 'providers/common/der')
-rw-r--r-- | providers/common/der/der_dsa.h.in | 6 | ||||
-rw-r--r-- | providers/common/der/der_dsa_key.c | 9 | ||||
-rw-r--r-- | providers/common/der/der_dsa_sig.c | 10 | ||||
-rw-r--r-- | providers/common/der/der_ec.h.in | 6 | ||||
-rw-r--r-- | providers/common/der/der_ec_key.c | 10 | ||||
-rw-r--r-- | providers/common/der/der_ec_sig.c | 10 | ||||
-rw-r--r-- | providers/common/der/der_ecx.h.in | 8 | ||||
-rw-r--r-- | providers/common/der/der_ecx_key.c | 40 | ||||
-rw-r--r-- | providers/common/der/der_rsa.h.in | 10 | ||||
-rw-r--r-- | providers/common/der/der_rsa_key.c | 25 | ||||
-rw-r--r-- | providers/common/der/der_rsa_sig.c | 10 | ||||
-rw-r--r-- | providers/common/der/der_sm2_key.c | 8 | ||||
-rw-r--r-- | providers/common/der/der_sm2_sig.c | 6 |
13 files changed, 80 insertions, 78 deletions
diff --git a/providers/common/der/der_dsa.h.in b/providers/common/der/der_dsa.h.in index e9a8718fc6..e24c9845a9 100644 --- a/providers/common/der/der_dsa.h.in +++ b/providers/common/der/der_dsa.h.in @@ -17,7 +17,7 @@ -} /* Subject Public Key Info */ -int DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa); +int ossl_DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa); /* Signature */ -int DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag, - DSA *dsa, int mdnid); +int ossl_DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag, + DSA *dsa, int mdnid); diff --git a/providers/common/der/der_dsa_key.c b/providers/common/der/der_dsa_key.c index 6118b275fb..b0a6db1054 100644 --- a/providers/common/der/der_dsa_key.c +++ b/providers/common/der/der_dsa_key.c @@ -11,10 +11,11 @@ #include "internal/packet.h" #include "prov/der_dsa.h" -int DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa) +int ossl_DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa) { - return DER_w_begin_sequence(pkt, tag) + return ossl_DER_w_begin_sequence(pkt, tag) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_dsa, sizeof(der_oid_id_dsa)) - && DER_w_end_sequence(pkt, tag); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_dsa, + sizeof(der_oid_id_dsa)) + && ossl_DER_w_end_sequence(pkt, tag); } diff --git a/providers/common/der/der_dsa_sig.c b/providers/common/der/der_dsa_sig.c index c96a617dad..ad747340ad 100644 --- a/providers/common/der/der_dsa_sig.c +++ b/providers/common/der/der_dsa_sig.c @@ -17,8 +17,8 @@ precompiled_sz = sizeof(der_oid_id_dsa_with_##name); \ break; -int DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag, - DSA *dsa, int mdnid) +int ossl_DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag, + DSA *dsa, int mdnid) { const unsigned char *precompiled = NULL; size_t precompiled_sz = 0; @@ -37,8 +37,8 @@ int DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag, return 0; } - return DER_w_begin_sequence(pkt, tag) + return ossl_DER_w_begin_sequence(pkt, tag) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) - && DER_w_end_sequence(pkt, tag); + && ossl_DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) + && ossl_DER_w_end_sequence(pkt, tag); } diff --git a/providers/common/der/der_ec.h.in b/providers/common/der/der_ec.h.in index 86a754e4ff..2d56119ba1 100644 --- a/providers/common/der/der_ec.h.in +++ b/providers/common/der/der_ec.h.in @@ -17,7 +17,7 @@ -} /* Subject Public Key Info */ -int DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec); +int ossl_DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec); /* Signature */ -int DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont, - EC_KEY *ec, int mdnid); +int ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont, + EC_KEY *ec, int mdnid); diff --git a/providers/common/der/der_ec_key.c b/providers/common/der/der_ec_key.c index 058596a96e..4c0b9a2dd5 100644 --- a/providers/common/der/der_ec_key.c +++ b/providers/common/der/der_ec_key.c @@ -11,11 +11,11 @@ #include "internal/packet.h" #include "prov/der_ec.h" -int DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec) +int ossl_DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_ecPublicKey, - sizeof(der_oid_id_ecPublicKey)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_ecPublicKey, + sizeof(der_oid_id_ecPublicKey)) + && ossl_DER_w_end_sequence(pkt, cont); } diff --git a/providers/common/der/der_ec_sig.c b/providers/common/der/der_ec_sig.c index 687ec49c1f..095e225077 100644 --- a/providers/common/der/der_ec_sig.c +++ b/providers/common/der/der_ec_sig.c @@ -24,8 +24,8 @@ precompiled_sz = sizeof(der_oid_id_ecdsa_with_##name); \ break; -int DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont, - EC_KEY *ec, int mdnid) +int ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont, + EC_KEY *ec, int mdnid) { const unsigned char *precompiled = NULL; size_t precompiled_sz = 0; @@ -44,8 +44,8 @@ int DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont, return 0; } - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) + && ossl_DER_w_end_sequence(pkt, cont); } diff --git a/providers/common/der/der_ecx.h.in b/providers/common/der/der_ecx.h.in index 9d9a82e399..ae2310c829 100644 --- a/providers/common/der/der_ecx.h.in +++ b/providers/common/der/der_ecx.h.in @@ -17,7 +17,7 @@ filter => \&oids_to_c::filter_to_H }); -} -int DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec); -int DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec); -int DER_w_algorithmIdentifier_X25519(WPACKET *pkt, int cont, ECX_KEY *ec); -int DER_w_algorithmIdentifier_X448(WPACKET *pkt, int cont, ECX_KEY *ec); +int ossl_DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec); +int ossl_DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec); +int ossl_DER_w_algorithmIdentifier_X25519(WPACKET *pkt, int cont, ECX_KEY *ec); +int ossl_DER_w_algorithmIdentifier_X448(WPACKET *pkt, int cont, ECX_KEY *ec); diff --git a/providers/common/der/der_ecx_key.c b/providers/common/der/der_ecx_key.c index 206795ed93..d445836866 100644 --- a/providers/common/der/der_ecx_key.c +++ b/providers/common/der/der_ecx_key.c @@ -11,38 +11,38 @@ #include "internal/packet.h" #include "prov/der_ecx.h" -int DER_w_algorithmIdentifier_X25519(WPACKET *pkt, int cont, ECX_KEY *ec) +int ossl_DER_w_algorithmIdentifier_X25519(WPACKET *pkt, int cont, ECX_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_X25519, - sizeof(der_oid_id_X25519)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_X25519, + sizeof(der_oid_id_X25519)) + && ossl_DER_w_end_sequence(pkt, cont); } -int DER_w_algorithmIdentifier_X448(WPACKET *pkt, int cont, ECX_KEY *ec) +int ossl_DER_w_algorithmIdentifier_X448(WPACKET *pkt, int cont, ECX_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_X448, - sizeof(der_oid_id_X448)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_X448, + sizeof(der_oid_id_X448)) + && ossl_DER_w_end_sequence(pkt, cont); } -int DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec) +int ossl_DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_Ed25519, - sizeof(der_oid_id_Ed25519)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_Ed25519, + sizeof(der_oid_id_Ed25519)) + && ossl_DER_w_end_sequence(pkt, cont); } -int DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec) +int ossl_DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, der_oid_id_Ed448, - sizeof(der_oid_id_Ed448)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_Ed448, + sizeof(der_oid_id_Ed448)) + && ossl_DER_w_end_sequence(pkt, cont); } diff --git a/providers/common/der/der_rsa.h.in b/providers/common/der/der_rsa.h.in index c744fc25c5..412d5bbe7f 100644 --- a/providers/common/der/der_rsa.h.in +++ b/providers/common/der/der_rsa.h.in @@ -19,10 +19,10 @@ -} /* PSS parameters */ -int DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, - const RSA_PSS_PARAMS_30 *pss); +int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, + const RSA_PSS_PARAMS_30 *pss); /* Subject Public Key Info */ -int DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa); +int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa); /* Signature */ -int DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag, - RSA *rsa, int mdnid); +int ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag, + RSA *rsa, int mdnid); diff --git a/providers/common/der/der_rsa_key.c b/providers/common/der/der_rsa_key.c index bd2de4a6c3..5340b6756b 100644 --- a/providers/common/der/der_rsa_key.c +++ b/providers/common/der/der_rsa_key.c @@ -264,7 +264,7 @@ static int DER_w_MaskGenAlgorithm(WPACKET *pkt, int tag, if (maskgenalg == NULL) return 1; - return DER_w_precompiled(pkt, tag, maskgenalg, maskgenalg_sz); + return ossl_DER_w_precompiled(pkt, tag, maskgenalg, maskgenalg_sz); } return 0; } @@ -275,7 +275,8 @@ static int DER_w_MaskGenAlgorithm(WPACKET *pkt, int tag, var##_sz = sizeof(der_oid_id_##name); \ break; -int DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, const RSA_PSS_PARAMS_30 *pss) +int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, + const RSA_PSS_PARAMS_30 *pss) { int hashalg_nid, default_hashalg_nid; int saltlen, default_saltlen; @@ -329,14 +330,14 @@ int DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, const RSA_PSS_PARAMS_30 *pss) return 0; } - return DER_w_begin_sequence(pkt, tag) + return ossl_DER_w_begin_sequence(pkt, tag) && (trailerfield == default_trailerfield - || DER_w_ulong(pkt, 3, trailerfield)) - && (saltlen == default_saltlen || DER_w_ulong(pkt, 2, saltlen)) + || ossl_DER_w_ulong(pkt, 3, trailerfield)) + && (saltlen == default_saltlen || ossl_DER_w_ulong(pkt, 2, saltlen)) && DER_w_MaskGenAlgorithm(pkt, 1, pss) && (hashalg_nid == default_hashalg_nid - || DER_w_precompiled(pkt, 0, hashalg, hashalg_sz)) - && DER_w_end_sequence(pkt, tag); + || ossl_DER_w_precompiled(pkt, 0, hashalg, hashalg_sz)) + && ossl_DER_w_end_sequence(pkt, tag); } /* Aliases so we can have a uniform RSA_CASE */ @@ -348,7 +349,7 @@ int DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, const RSA_PSS_PARAMS_30 *pss) var##_oid_sz = sizeof(der_oid_##name); \ break; -int DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa) +int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa) { int rsa_nid = NID_undef; const unsigned char *rsa_oid = NULL; @@ -365,10 +366,10 @@ int DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa) if (rsa_oid == NULL) return 0; - return DER_w_begin_sequence(pkt, tag) + return ossl_DER_w_begin_sequence(pkt, tag) && (rsa_nid != NID_rsassaPss || rsa_pss_params_30_is_unrestricted(pss_params) - || DER_w_RSASSA_PSS_params(pkt, -1, pss_params)) - && DER_w_precompiled(pkt, -1, rsa_oid, rsa_oid_sz) - && DER_w_end_sequence(pkt, tag); + || ossl_DER_w_RSASSA_PSS_params(pkt, -1, pss_params)) + && ossl_DER_w_precompiled(pkt, -1, rsa_oid, rsa_oid_sz) + && ossl_DER_w_end_sequence(pkt, tag); } diff --git a/providers/common/der/der_rsa_sig.c b/providers/common/der/der_rsa_sig.c index a1ab263dc1..5bdfa66255 100644 --- a/providers/common/der/der_rsa_sig.c +++ b/providers/common/der/der_rsa_sig.c @@ -28,8 +28,8 @@ var##_sz = sizeof(der_oid_##name##WithRSAEncryption); \ break; -int DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag, - RSA *rsa, int mdnid) +int ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag, + RSA *rsa, int mdnid) { const unsigned char *precompiled = NULL; size_t precompiled_sz = 0; @@ -57,8 +57,8 @@ int DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag, return 0; } - return DER_w_begin_sequence(pkt, tag) + return ossl_DER_w_begin_sequence(pkt, tag) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) - && DER_w_end_sequence(pkt, tag); + && ossl_DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) + && ossl_DER_w_end_sequence(pkt, tag); } diff --git a/providers/common/der/der_sm2_key.c b/providers/common/der/der_sm2_key.c index 7167088099..6a458514b5 100644 --- a/providers/common/der/der_sm2_key.c +++ b/providers/common/der/der_sm2_key.c @@ -14,10 +14,10 @@ int DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec) { - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ /* It seems SM2 identifier is the same as id_ecPublidKey */ - && DER_w_precompiled(pkt, -1, der_oid_id_ecPublicKey, - sizeof(der_oid_id_ecPublicKey)) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, der_oid_id_ecPublicKey, + sizeof(der_oid_id_ecPublicKey)) + && ossl_DER_w_end_sequence(pkt, cont); } diff --git a/providers/common/der/der_sm2_sig.c b/providers/common/der/der_sm2_sig.c index a35755065e..8c37c4d84d 100644 --- a/providers/common/der/der_sm2_sig.c +++ b/providers/common/der/der_sm2_sig.c @@ -32,8 +32,8 @@ int DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont, return 0; } - return DER_w_begin_sequence(pkt, cont) + return ossl_DER_w_begin_sequence(pkt, cont) /* No parameters (yet?) */ - && DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) - && DER_w_end_sequence(pkt, cont); + && ossl_DER_w_precompiled(pkt, -1, precompiled, precompiled_sz) + && ossl_DER_w_end_sequence(pkt, cont); } |