In the RFC6979 test vectors, ensure private keys are correctly encoded

The encoding of these keys is supposed to have a fixed length based on the curve (this enables constant time processing, see oss-security this week). Several of these have private scalars that have leading 0s, but were encoded with the 0s truncated off. This adds back the 0s.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28956)

diff --git a/test/recipes/30-test_evp_data/evppkey_ecdsa_rfc6979.txt b/test/recipes/30-test_evp_data/evppkey_ecdsa_rfc6979.txt
index 7f30c6982d1ffcf100d235f22b2cf90a7e60fefc..cf54fdb3d22ba0060c0afd4652356729adcd627f 100644 (file)
--- a/test/recipes/30-test_evp_data/evppkey_ecdsa_rfc6979.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecdsa_rfc6979.txt
@@ -849,8 +849,9 @@ Title = RFC 6979 P-521 deterministic ECDSA tests
 
 PrivateKey=P-521_PRIV
 -----BEGIN PRIVATE KEY-----
-MF8CAQAwEAYHKoZIzj0CAQYFK4EEACMESDBGAgEBBEH60G2qYro7JdL7QBM9p1cgXeZ/W7ABj+6M
-huG2jH51yqiW6zLx9HxwhVg2ptFvzBRm9tj77GfbiewMCLDplrg1OA==
+MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIA+tBtqmK6OyXS+0ATPadX
+IF3mf1uwAY/ujIbhtox+dcqolusy8fR8cIVYNqbRb8wUZvbY++xn24nsDAiw6Za4
+NTg=
 -----END PRIVATE KEY-----
 
 PublicKey=P-521_PUB
@@ -1050,7 +1051,8 @@ Title = RFC 6979 K-163 deterministic ECDSA tests
 
 PrivateKey=K-163_PRIV
 -----BEGIN PRIVATE KEY-----
-MDICAQAwEAYHKoZIzj0CAQYFK4EEAAEEGzAZAgEBBBSaTWeSKVp/cw/D8rScvA9i6GInLw==
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAEEHDAaAgEBBBUAmk1nkilaf3MPw/K0nLwP
+YuhiJy8=
 -----END PRIVATE KEY-----
 
 PublicKey=K-163_PUB
@@ -1465,8 +1467,8 @@ Title = RFC 6979 K-283 deterministic ECDSA tests
 
 PrivateKey=K-283_PRIV
 -----BEGIN PRIVATE KEY-----
-MEECAQAwEAYHKoZIzj0CAQYFK4EEABAEKjAoAgEBBCNqB3c1boe4m6HtOj2EU1e+MyFzyPemW9x9
-tPqzxMx5rMgZTg==
+MEICAQAwEAYHKoZIzj0CAQYFK4EEABAEKzApAgEBBCQAagd3NW6HuJuh7To9hFNX
+vjMhc8j3plvcfbT6s8TMeazIGU4=
 -----END PRIVATE KEY-----
 
 PublicKey=K-283_PUB
@@ -1866,8 +1868,9 @@ Title = RFC 6979 K-571 deterministic ECDSA tests
 
 PrivateKey=K-571_PRIV
 -----BEGIN PRIVATE KEY-----
-MGUCAQAwEAYHKoZIzj0CAQYFK4EEACYETjBMAgEBBEfBb1hVDYJO17lVadREU3XTpJC8fgGUxBo5
-3rcywpOWzfHWbeAt0UYKgWYG877A8yICx70Yoy2HUGRmqpIDLxMU7XsZdisNIg==
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACYETzBNAgEBBEgAwW9YVQ2CTte5VWnURFN1
+06SQvH4BlMQaOd63MsKTls3x1m3gLdFGCoFmBvO+wPMiAse9GKMth1BkZqqSAy8T
+FO17GXYrDSI=
 -----END PRIVATE KEY-----
 
 PublicKey=K-571_PUB
@@ -2282,8 +2285,7 @@ Title = RFC 6979 B-233 deterministic ECDSA tests
 
 PrivateKey=B-233_PRIV
 -----BEGIN PRIVATE KEY-----
-MDsCAQAwEAYHKoZIzj0CAQYFK4EEABsEJDAiAgEBBB163BPdW/NNHd7rULLOI7X15tGAZzBtYMX2
-/xHl0w==
+MDwCAQAwEAYHKoZIzj0CAQYFK4EEABsEJTAjAgEBBB4AetwT3VvzTR3e61CyziO19ebRgGcwbWDF9v8R5dM=
 -----END PRIVATE KEY-----
 
 PublicKey=B-233_PUB
@@ -2682,8 +2684,8 @@ Title = RFC 6979 B-409 deterministic ECDSA tests
 
 PrivateKey=B-409_PRIV
 -----BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFK4EEACUEOjA4AgEBBDNJSZTMMlsI57TOA4vZQ2+QteWaLBPDFAzT
-rgfASgH8SJ9XLOBWmm23uAYDk952MwxiQXc=
+MFICAQAwEAYHKoZIzj0CAQYFK4EEACUEOzA5AgEBBDQASUmUzDJbCOe0zgOL2UNv
+kLXlmiwTwxQM064HwEoB/EifVyzgVpptt7gGA5PedjMMYkF3
 -----END PRIVATE KEY-----
 
 PublicKey=B-409_PUB
@@ -2883,8 +2885,9 @@ Title = RFC 6979 B-571 deterministic ECDSA tests
 
 PrivateKey=B-571_PRIV
 -----BEGIN PRIVATE KEY-----
-MGUCAQAwEAYHKoZIzj0CAQYFK4EEACcETjBMAgEBBEcooEhX8kwcCC3w2QnA5y9FPy4jQMywcfDj
-ibyiV12hkSQZjFcXSSmtJuNIz2P3jSgCHvWpvy1cvq9rfMtsTagk3VyCz7JOEQ==
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACcETzBNAgEBBEgAKKBIV/JMHAgt8NkJwOcv
+RT8uI0DMsHHw44m8olddoZEkGYxXF0kprSbjSM9j940oAh71qb8tXL6va3zLbE2o
+JN1cgs+yThE=
 -----END PRIVATE KEY-----
 
 PublicKey=B-571_PUB