arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PublicKey is optional for curve25519

pull/769/head
Jeffrey Walton 2018-12-26 20:35:49 -05:00
parent d5338fd212
commit 0c658f5a7c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xed25519.cpp
View File

@ -173,9 +173,12 @@ void x25519::BERDecode(BufferedTransformation &bt)
BERDecodePrivateKey(octetString, false, (size_t)privateKeyInfo.RemainingLength()); BERDecodePrivateKey(octetString, false, (size_t)privateKeyInfo.RemainingLength());
octetString.MessageEnd(); octetString.MessageEnd();
// publicKey [1] IMPLICIT PublicKey OPTIONAL
bool generatePublicKey = true; bool generatePublicKey = true;
if (version == 1) if (privateKeyInfo.EndReached() == false /*version == 1?*/)
{ {
// Should we test this before decoding? In either case we
// just throw a BERDecodeErr() when we can't parse it.
BERGeneralDecoder publicKey(privateKeyInfo, CONTEXT_SPECIFIC | CONSTRUCTED | 1); BERGeneralDecoder publicKey(privateKeyInfo, CONTEXT_SPECIFIC | CONSTRUCTED | 1);
SecByteBlock subjectPublicKey; SecByteBlock subjectPublicKey;
unsigned int unusedBits; unsigned int unusedBits;
@ -510,9 +513,12 @@ void ed25519PrivateKey::BERDecode(BufferedTransformation &bt)
BERDecodePrivateKey(octetString, false, (size_t)privateKeyInfo.RemainingLength()); BERDecodePrivateKey(octetString, false, (size_t)privateKeyInfo.RemainingLength());
octetString.MessageEnd(); octetString.MessageEnd();
// publicKey [1] IMPLICIT PublicKey OPTIONAL
bool generatePublicKey = true; bool generatePublicKey = true;
if (version == 1) if (privateKeyInfo.EndReached() == false /*version == 1?*/)
{ {
// Should we test this before decoding? In either case we
// just throw a BERDecodeErr() when we can't parse it.
BERGeneralDecoder publicKey(privateKeyInfo, CONTEXT_SPECIFIC | CONSTRUCTED | 1); BERGeneralDecoder publicKey(privateKeyInfo, CONTEXT_SPECIFIC | CONSTRUCTED | 1);
SecByteBlock subjectPublicKey; SecByteBlock subjectPublicKey;
unsigned int unusedBits; unsigned int unusedBits;