diff options
| author | lloyd <[email protected]> | 2013-11-02 12:59:38 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-11-02 12:59:38 +0000 |
| commit | c9796e33c31b64a9367b9df52a3aede092bc93b3 (patch) | |
| tree | e6669913dea357e5af618ecb154fd7764e4fe1a6 | |
| parent | dfa79c1b61a94a5284aedf1af84f33dd15872fa1 (diff) | |
Fix encoding error in ECC group encoding, fix by fxdupont on github
| -rw-r--r-- | doc/log.txt | 3 | ||||
| -rw-r--r-- | src/pubkey/ec_group/ec_group.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/log.txt b/doc/log.txt index c27caa227..72ed320db 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -10,6 +10,9 @@ Series 1.10 Version 1.10.6, Not Yet Released ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +* Fix an encoding error in EC_Group when encoding using EC_DOMPAR_ENC_OID. + Reported by fxdupont on github. + * In EMSA2 and Randpool, avoid calling name() on objects after deleting them if the provided algorithm objects are not suitable for use. Found by Clang analyzer, reported by Jeffrey Walton. diff --git a/src/pubkey/ec_group/ec_group.cpp b/src/pubkey/ec_group/ec_group.cpp index fe4fae885..1365ab633 100644 --- a/src/pubkey/ec_group/ec_group.cpp +++ b/src/pubkey/ec_group/ec_group.cpp @@ -121,7 +121,7 @@ EC_Group::DER_encode(EC_Group_Encoding form) const .get_contents(); } else if(form == EC_DOMPAR_ENC_OID) - return DER_Encoder().encode(get_oid()).get_contents(); + return DER_Encoder().encode(OID(get_oid())).get_contents(); else if(form == EC_DOMPAR_ENC_IMPLICITCA) return DER_Encoder().encode_null().get_contents(); else |