From f7780b6745a66807a6611fa5ed4f41b353298fb1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 6 Feb 2010 18:47:08 +0000
Subject: [PATCH] * TrustedUpdate: - Allow method to check if we know
about a key - Add method to extract without verifying
---
.../src/net/i2p/crypto/TrustedUpdate.java | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index 3d5aa0c1e1..133a180333 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -178,6 +178,22 @@ D8usM7Dxp5yrDrCYZ5AIijc=
return true;
}
+ /**
+ * Do we know about the following key?
+ * @since 0.7.12
+ */
+ public boolean haveKey(String key) {
+ if (key.length() != KEYSIZE_B64_BYTES)
+ return false;
+ SigningPublicKey signingPublicKey = new SigningPublicKey();
+ try {
+ signingPublicKey.fromBase64(key);
+ } catch (DataFormatException dfe) {
+ return false;
+ }
+ return _trustedKeys.containsKey(signingPublicKey);
+ }
+
/**
* Parses command line arguments when this class is used from the command
* line.
@@ -410,6 +426,22 @@ D8usM7Dxp5yrDrCYZ5AIijc=
if (!verify(signedFile))
return "Unknown signing key or corrupt file";
+ return migrateFile(signedFile, outputFile);
+ }
+
+ /**
+ * Extract the file. Skips and ignores the signature and version. No verification.
+ *
+ * @param signedFile A signed update file.
+ * @param outputFile The file to write the verified data to.
+ *
+ * @return <code>null</code> if the
+ * data was moved, and an error <code>String</code> otherwise.
+ */
+ public String migrateFile(File signedFile, File outputFile) {
+ if (!signedFile.exists())
+ return "File not found: " + signedFile.getAbsolutePath();
+
FileInputStream fileInputStream = null;
FileOutputStream fileOutputStream = null;
--
GitLab