diff options
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/Discovery.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java) | 9 | ||||
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureException.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureException.java) | 2 | ||||
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureUnknownKeyException.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureUnknownKeyException.java) | 2 | ||||
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/SignatureTooOldException.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/SignatureTooOldException.java) | 2 | ||||
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/UnknownVerifyException.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/UnknownVerifyException.java) | 2 | ||||
| -rw-r--r-- | wrappers/java-android/lib/src/main/java/org/eduvpn/common/VerifyException.java (renamed from wrappers/java/src/main/java/nl/eduvpn/common/VerifyException.java) | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/Discovery.java index 69308c8..dfeef71 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/Discovery.java @@ -1,9 +1,8 @@ -package nl.eduvpn.common; +package org.eduvpn.common; import com.sun.jna.*; import java.nio.charset.StandardCharsets; -import java.time.Instant; public final class Discovery { private static final String LIB_NAME = "eduvpn_common"; @@ -16,13 +15,13 @@ public final class Discovery { * @param signature .minisig signature file contents. * @param signedJson Signed .json file contents. * @param expectedFileName The file type to be verified, one of {@code "server_list.json"} or {@code "organization_list.json"}. - * @param minSignTime Minimum time for signature. Should be set to at least the time of the previous signature. + * @param minSignTime Minimum time for signature (UNIX timestamp, seconds). Should be set to at least the time of the previous signature. * @throws IllegalArgumentException If {@code expectedFileName} is not one of the allowed values or one of the parameters is empty. * @throws VerifyException If signature verification fails. */ - public static void verify(byte[] signature, byte[] signedJson, String expectedFileName, Instant minSignTime) throws VerifyException { + public static void verify(byte[] signature, byte[] signedJson, String expectedFileName, long minSignTime) throws VerifyException { byte err = discovery.Verify(NativeApi.GoSlice.fromArray(signature), NativeApi.GoSlice.fromArray(signedJson), - NativeApi.GoSlice.fromString(expectedFileName), minSignTime.getEpochSecond()); + NativeApi.GoSlice.fromString(expectedFileName), minSignTime); switch (err) { case 0: diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureException.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureException.java index e531206..b739dd7 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureException.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureException.java @@ -1,4 +1,4 @@ -package nl.eduvpn.common; +package org.eduvpn.common; /** Signature is invalid (for the expected file type). */ public final class InvalidSignatureException extends VerifyException { diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureUnknownKeyException.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureUnknownKeyException.java index 8eaf661..6d651e5 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/InvalidSignatureUnknownKeyException.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/InvalidSignatureUnknownKeyException.java @@ -1,4 +1,4 @@ -package nl.eduvpn.common; +package org.eduvpn.common; /** Signature was created with an unknown key and has not been verified. */ public final class InvalidSignatureUnknownKeyException extends VerifyException { diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/SignatureTooOldException.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/SignatureTooOldException.java index c40c718..c89136f 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/SignatureTooOldException.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/SignatureTooOldException.java @@ -1,4 +1,4 @@ -package nl.eduvpn.common; +package org.eduvpn.common; /** Signature timestamp smaller than specified minimum signing time (rollback). */ public final class SignatureTooOldException extends VerifyException { diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/UnknownVerifyException.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/UnknownVerifyException.java index fa76a44..80b74ea 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/UnknownVerifyException.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/UnknownVerifyException.java @@ -1,4 +1,4 @@ -package nl.eduvpn.common; +package org.eduvpn.common; /** Other unknown error. */ public final class UnknownVerifyException extends VerifyException { diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/VerifyException.java b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/VerifyException.java index 71ea290..686ea41 100644 --- a/wrappers/java/src/main/java/nl/eduvpn/common/VerifyException.java +++ b/wrappers/java-android/lib/src/main/java/org/eduvpn/common/VerifyException.java @@ -1,4 +1,4 @@ -package nl.eduvpn.common; +package org.eduvpn.common; /** Verification failed, do not trust the file. */ public abstract class VerifyException extends Exception { |
