cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only skip hashing when creating an EDDSA authentication signature

Browse Source
This commit is contained in:
David Hedberg
2021-03-27 11:37:44 +01:00
parent 43b85e12ea
commit f45254cf07
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/NfcSyncPGPContentSignerBuilder.java
View File

@@ -34,6 +34,7 @@ public class NfcSyncPGPContentSignerBuilder
private int hashAlgorithm;
private int keyAlgorithm;
private long keyID;
private boolean isEdDsaAuthenticationSignature = false;
private Map signedHashes;
@@ -86,6 +87,13 @@ public class NfcSyncPGPContentSignerBuilder
return this;
}
public NfcSyncPGPContentSignerBuilder configureForEdDsaAuthenticationSignature()
{
isEdDsaAuthenticationSignature = true;
return this;
}
public PGPContentSigner build(final int signatureType, PGPPrivateKey privateKey)
throws PGPException {
// NOTE: privateKey is null in this case!
@@ -95,8 +103,8 @@ public class NfcSyncPGPContentSignerBuilder
public PGPContentSigner build(final int signatureType, final long keyID)
throws PGPException
{
if (keyAlgorithm == PublicKeyAlgorithmTags.EDDSA) {
return buildEdDSASigner(signatureType, keyID);
if (isEdDsaAuthenticationSignature) {
return buildEdDSAAuthenticationSigner(signatureType, keyID);
}
final PGPDigestCalculator digestCalculator = digestCalculatorProviderBuilder.build().get(hashAlgorithm);
@@ -146,7 +154,7 @@ public class NfcSyncPGPContentSignerBuilder
};
}
public PGPContentSigner buildEdDSASigner(final int signatureType, final long keyID)
public PGPContentSigner buildEdDSAAuthenticationSigner(final int signatureType, final long keyID)
throws PGPException
{
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();