diff options
| author | Jack Lloyd <[email protected]> | 2018-07-24 11:07:00 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-07-24 11:07:00 -0400 |
| commit | b283898aef023314808e0d9c34b021a1db53e8ed (patch) | |
| tree | bc96c3e583eaee37095fede75722dbb3b161bf3c | |
| parent | 34aba8b6da12ee4c3bef2ed9779effa5d3f0e07d (diff) | |
| parent | 3ed4e1bcf332493e1132ce45a2ad3c5f8610cfb5 (diff) | |
Merge GH #1635 Include ECC public key in the private key data
| -rw-r--r-- | src/lib/pubkey/ecc_key/ecc_key.cpp | 6 | ||||
| -rwxr-xr-x | src/scripts/test_cli.py | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/lib/pubkey/ecc_key/ecc_key.cpp b/src/lib/pubkey/ecc_key/ecc_key.cpp index 2c23c1b47..767a799bf 100644 --- a/src/lib/pubkey/ecc_key/ecc_key.cpp +++ b/src/lib/pubkey/ecc_key/ecc_key.cpp @@ -147,8 +147,10 @@ secure_vector<uint8_t> EC_PrivateKey::private_key_bits() const return DER_Encoder() .start_cons(SEQUENCE) .encode(static_cast<size_t>(1)) - .encode(BigInt::encode_1363(m_private_key, m_private_key.bytes()), - OCTET_STRING) + .encode(BigInt::encode_1363(m_private_key, m_private_key.bytes()), OCTET_STRING) + .start_cons(ASN1_Tag(1), PRIVATE) + .encode(m_public_key.encode(PointGFp::Compression_Type::UNCOMPRESSED), BIT_STRING) + .end_cons() .end_cons() .get_contents(); } diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py index 6c0355a18..bb2e5f34a 100755 --- a/src/scripts/test_cli.py +++ b/src/scripts/test_cli.py @@ -207,8 +207,9 @@ fnnj+9XriKKHf2WtX0T4FXorvnKq30m934rzAhUAvwhWDK3yZEmphc7dwl4/J3Zp def cli_key_tests(): pem = """-----BEGIN PRIVATE KEY----- -MD4CAQAwEAYHKoZIzj0CAQYFK4EEAAoEJzAlAgEBBCDYD4j2rb5lrLEMNgLmfZhb -wGf/MGbgPebBLmozAANENw== +MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQg2A+I9q2+ZayxDDYC5n2Y +W8Bn/zBm4D3mwS5qMwADRDehRANCAATwnDFqsjXL9SD/Rr1Vy4pb79PswXdQNZBN +mlLtJ5JvZ0/p6zP3x+Y9yPIrAR8L/acG5ItSrAKXzzuqQQZMv4aN -----END PRIVATE KEY-----""" tmp_dir = tempfile.mkdtemp(prefix='botan_cli') @@ -225,16 +226,16 @@ wGf/MGbgPebBLmozAANENw== test_cli("pkcs8", "--pub-out --output=%s %s" % (pub_key, priv_key), "") - valid_sig = "xd3J9jtTBWFWA9ceVGYpmEB0A1DmOoxHRF7FpYW2ng/GYEH/HYljIfYzu/L5iTK6XfVePxeMr6ubCYCD9vFGIw==" + valid_sig = "nI4mI1ec14Y7nYUWs2edysAVvkob0TWpmGh5rrYWDA+/W9Fj0ZM21qJw8qa3/avAOIVBO6hoMEVmfJYXlS+ReA==" - test_cli("sign", "--provider=base %s %s" % (priv_key, priv_key), valid_sig) + test_cli("sign", "--provider=base %s %s" % (priv_key, pub_key), valid_sig) - test_cli("verify", [pub_key, priv_key, '-'], + test_cli("verify", [pub_key, pub_key, '-'], "Signature is valid", valid_sig) - test_cli("verify", [pub_key, priv_key, '-'], + test_cli("verify", [pub_key, pub_key, '-'], "Signature is invalid", - valid_sig.replace("W", "Z")) + valid_sig.replace("G", "H")) test_cli("gen_self_signed", [priv_key, "CA", "--ca", "--country=VT", |