Merge branch 'ia/ssl/certificate_types/certificate_requests/OTP-12026' into maint

* ia/ssl/certificate_types/certificate_requests/OTP-12026:
  public_key: Updated User Guide with ECC records
  ssl: Make sure the correct ROOT-cert is used
  ssl: Test ECDSA and improve test suite maintainability
  public_key: Correct ASN1-type EcpkParameters in PEM handling
  public_key: Correct ASN-1 spec
  ssl: Correct handling of certificate_types in Certificate Requests

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index 8d3c76adf5..37196bb9bf 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -452,23 +452,23 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= {
 
    ecdsa-with-sha1 SIGNATURE-ALGORITHM-CLASS ::= {
        ID ecdsa-with-SHA1
-       TYPE NULL }  -- XXX Must be empty and not NULL
+       TYPE EcpkParameters }  -- XXX Must be empty and not NULL
 
    ecdsa-with-sha224 SIGNATURE-ALGORITHM-CLASS ::= {
        ID ecdsa-with-SHA224
-       TYPE NULL }  -- XXX Must be empty and not NULL
+       TYPE EcpkParameters }  -- XXX Must be empty and not NULL
 
    ecdsa-with-sha256 SIGNATURE-ALGORITHM-CLASS ::= {
        ID ecdsa-with-SHA256
-       TYPE NULL }  -- XXX Must be empty and not NULL
+       TYPE EcpkParameters }  -- XXX Must be empty and not NULL
 
    ecdsa-with-sha384 SIGNATURE-ALGORITHM-CLASS ::= {
        ID ecdsa-with-SHA384
-       TYPE NULL }  -- XXX Must be empty and not NULL
+       TYPE EcpkParameters }  -- XXX Must be empty and not NULL
 
    ecdsa-with-sha512 SIGNATURE-ALGORITHM-CLASS ::= {
        ID ecdsa-with-SHA512
-       TYPE NULL }  -- XXX Must be empty and not NULL
+       TYPE EcpkParameters }  -- XXX Must be empty and not NULL
 
    FIELD-ID-CLASS ::= CLASS {
 	&id OBJECT IDENTIFIER UNIQUE,