Skip to content
Snippets Groups Projects
Commit 37d4d79c authored by akwizgran's avatar akwizgran
Browse files

Don't rethrow SignatureException as RuntimeException.

parent 8b396078
No related branches found
No related tags found
No related merge requests found
...@@ -483,7 +483,7 @@ class CryptoComponentImpl implements CryptoComponent { ...@@ -483,7 +483,7 @@ class CryptoComponentImpl implements CryptoComponent {
} }
private void updateSignature(Signature signature, String label, private void updateSignature(Signature signature, String label,
byte[] toSign) { byte[] toSign) throws GeneralSecurityException {
byte[] labelBytes = StringUtils.toUtf8(label); byte[] labelBytes = StringUtils.toUtf8(label);
byte[] length = new byte[INT_32_BYTES]; byte[] length = new byte[INT_32_BYTES];
ByteUtils.writeUint32(labelBytes.length, length, 0); ByteUtils.writeUint32(labelBytes.length, length, 0);
......
...@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; ...@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.Provider; import java.security.Provider;
import java.security.SignatureException;
import static net.i2p.crypto.eddsa.EdDSAEngine.SIGNATURE_ALGORITHM; import static net.i2p.crypto.eddsa.EdDSAEngine.SIGNATURE_ALGORITHM;
...@@ -57,47 +56,28 @@ class EdSignature implements Signature { ...@@ -57,47 +56,28 @@ class EdSignature implements Signature {
} }
@Override @Override
public void update(byte b) { public void update(byte b) throws GeneralSecurityException {
try { signature.update(b);
signature.update(b);
} catch (SignatureException e) {
throw new RuntimeException(e);
}
} }
@Override @Override
public void update(byte[] b) { public void update(byte[] b) throws GeneralSecurityException {
try { signature.update(b);
signature.update(b);
} catch (SignatureException e) {
throw new RuntimeException(e);
}
} }
@Override @Override
public void update(byte[] b, int off, int len) { public void update(byte[] b, int off, int len)
try { throws GeneralSecurityException {
signature.update(b, off, len); signature.update(b, off, len);
} catch (SignatureException e) {
throw new RuntimeException(e);
}
} }
@Override @Override
public byte[] sign() { public byte[] sign() throws GeneralSecurityException {
try { return signature.sign();
return signature.sign();
} catch (SignatureException e) {
throw new RuntimeException(e);
}
} }
@Override @Override
public boolean verify(byte[] sig) { public boolean verify(byte[] sig) throws GeneralSecurityException {
try { return signature.verify(sig);
return signature.verify(sig);
} catch (SignatureException e) {
throw new RuntimeException(e);
}
} }
} }
...@@ -22,25 +22,25 @@ interface Signature { ...@@ -22,25 +22,25 @@ interface Signature {
/** /**
* @see {@link java.security.Signature#update(byte)} * @see {@link java.security.Signature#update(byte)}
*/ */
void update(byte b); void update(byte b) throws GeneralSecurityException;
/** /**
* @see {@link java.security.Signature#update(byte[])} * @see {@link java.security.Signature#update(byte[])}
*/ */
void update(byte[] b); void update(byte[] b) throws GeneralSecurityException;
/** /**
* @see {@link java.security.Signature#update(byte[], int, int)} * @see {@link java.security.Signature#update(byte[], int, int)}
*/ */
void update(byte[] b, int off, int len); void update(byte[] b, int off, int len) throws GeneralSecurityException;
/** /**
* @see {@link java.security.Signature#sign()} * @see {@link java.security.Signature#sign()}
*/ */
byte[] sign(); byte[] sign() throws GeneralSecurityException;
/** /**
* @see {@link java.security.Signature#verify(byte[])} * @see {@link java.security.Signature#verify(byte[])}
*/ */
boolean verify(byte[] signature); boolean verify(byte[] signature) throws GeneralSecurityException;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment