Update spongycastle to 1.53
This commit is contained in:
parent
cb365e450b
commit
b84c9a8fb6
|
@ -23,6 +23,7 @@ import org.spongycastle.openpgp.PGPPublicKey;
|
||||||
import org.spongycastle.openpgp.PGPPublicKeyRing;
|
import org.spongycastle.openpgp.PGPPublicKeyRing;
|
||||||
import org.spongycastle.openpgp.PGPSecretKey;
|
import org.spongycastle.openpgp.PGPSecretKey;
|
||||||
import org.spongycastle.openpgp.PGPSecretKeyRing;
|
import org.spongycastle.openpgp.PGPSecretKeyRing;
|
||||||
|
import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
|
||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
||||||
import org.sufficientlysecure.keychain.util.IterableIterator;
|
import org.sufficientlysecure.keychain.util.IterableIterator;
|
||||||
|
|
||||||
|
@ -42,7 +43,7 @@ public class CanonicalizedPublicKeyRing extends CanonicalizedKeyRing {
|
||||||
super(verified);
|
super(verified);
|
||||||
if(mRing == null) {
|
if(mRing == null) {
|
||||||
// get first object in block
|
// get first object in block
|
||||||
PGPObjectFactory factory = new PGPObjectFactory(blob);
|
PGPObjectFactory factory = new PGPObjectFactory(blob, new JcaKeyFingerprintCalculator());
|
||||||
try {
|
try {
|
||||||
Object obj = factory.nextObject();
|
Object obj = factory.nextObject();
|
||||||
if (! (obj instanceof PGPPublicKeyRing)) {
|
if (! (obj instanceof PGPPublicKeyRing)) {
|
||||||
|
|
|
@ -32,10 +32,10 @@ import org.spongycastle.openpgp.PGPException;
|
||||||
import org.spongycastle.openpgp.PGPLiteralData;
|
import org.spongycastle.openpgp.PGPLiteralData;
|
||||||
import org.spongycastle.openpgp.PGPLiteralDataGenerator;
|
import org.spongycastle.openpgp.PGPLiteralDataGenerator;
|
||||||
import org.spongycastle.openpgp.PGPSignatureGenerator;
|
import org.spongycastle.openpgp.PGPSignatureGenerator;
|
||||||
import org.spongycastle.openpgp.PGPUtil;
|
|
||||||
import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
|
import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
|
||||||
import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
|
import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
|
||||||
import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
|
import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
|
||||||
|
import org.spongycastle.openpgp.operator.jcajce.PGPUtil;
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
import org.sufficientlysecure.keychain.operations.BaseOperation;
|
import org.sufficientlysecure.keychain.operations.BaseOperation;
|
||||||
|
|
|
@ -30,6 +30,7 @@ import org.spongycastle.openpgp.PGPPublicKey;
|
||||||
import org.spongycastle.openpgp.PGPSignature;
|
import org.spongycastle.openpgp.PGPSignature;
|
||||||
import org.spongycastle.openpgp.PGPSignatureList;
|
import org.spongycastle.openpgp.PGPSignatureList;
|
||||||
import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
|
import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
|
||||||
|
import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
|
||||||
import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
|
import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
|
||||||
|
@ -131,7 +132,7 @@ public class WrappedSignature {
|
||||||
SignatureSubpacketTags.REVOCATION_REASON);
|
SignatureSubpacketTags.REVOCATION_REASON);
|
||||||
// For some reason, this is missing in SignatureSubpacketInputStream:146
|
// For some reason, this is missing in SignatureSubpacketInputStream:146
|
||||||
if (!(p instanceof RevocationReason)) {
|
if (!(p instanceof RevocationReason)) {
|
||||||
p = new RevocationReason(false, p.getData());
|
p = new RevocationReason(false, false, p.getData());
|
||||||
}
|
}
|
||||||
return ((RevocationReason) p).getRevocationDescription();
|
return ((RevocationReason) p).getRevocationDescription();
|
||||||
}
|
}
|
||||||
|
@ -222,7 +223,7 @@ public class WrappedSignature {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static WrappedSignature fromBytes(byte[] data) {
|
public static WrappedSignature fromBytes(byte[] data) {
|
||||||
PGPObjectFactory factory = new PGPObjectFactory(data);
|
PGPObjectFactory factory = new PGPObjectFactory(data, new JcaKeyFingerprintCalculator());
|
||||||
PGPSignatureList signatures = null;
|
PGPSignatureList signatures = null;
|
||||||
try {
|
try {
|
||||||
if ((signatures = (PGPSignatureList) factory.nextObject()) == null || signatures.isEmpty()) {
|
if ((signatures = (PGPSignatureList) factory.nextObject()) == null || signatures.isEmpty()) {
|
||||||
|
|
|
@ -182,7 +182,7 @@ public class KeyringBuilder {
|
||||||
createPreferencesSignatureSubpacket()
|
createPreferencesSignatureSubpacket()
|
||||||
};
|
};
|
||||||
SignatureSubpacket[] unhashedData = new SignatureSubpacket[]{
|
SignatureSubpacket[] unhashedData = new SignatureSubpacket[]{
|
||||||
new IssuerKeyID(false, KEY_ID.toByteArray())
|
new IssuerKeyID(false, false, KEY_ID.toByteArray())
|
||||||
};
|
};
|
||||||
byte[] fingerPrint = new BigInteger("522c", 16).toByteArray();
|
byte[] fingerPrint = new BigInteger("522c", 16).toByteArray();
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ public class KeyringBuilder {
|
||||||
new KeyExpirationTime(false, TimeUnit.DAYS.toSeconds(2)),
|
new KeyExpirationTime(false, TimeUnit.DAYS.toSeconds(2)),
|
||||||
};
|
};
|
||||||
SignatureSubpacket[] unhashedData = new SignatureSubpacket[]{
|
SignatureSubpacket[] unhashedData = new SignatureSubpacket[]{
|
||||||
new IssuerKeyID(false, KEY_ID.toByteArray())
|
new IssuerKeyID(false, false, KEY_ID.toByteArray())
|
||||||
};
|
};
|
||||||
byte[] fingerPrint = new BigInteger("234a", 16).toByteArray();
|
byte[] fingerPrint = new BigInteger("234a", 16).toByteArray();
|
||||||
MPInteger[] signature = new MPInteger[]{
|
MPInteger[] signature = new MPInteger[]{
|
||||||
|
|
2
extern/spongycastle
vendored
2
extern/spongycastle
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit b8387f22a9f20d1bd186a377e1ec9208c6eae3e5
|
Subproject commit 4d3469eaaa581cebb32e6a4e2b5ac98e6ec185e0
|
Loading…
Reference in a new issue