From daa49262e30bfa3e10f411c18a2034ca48dcb3c2 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 7 Jul 2014 15:12:44 +0200 Subject: more TODOs --- .../org/openslx/imagemaster/util/AsymMessageVerifier.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java/org/openslx/imagemaster/util') diff --git a/src/main/java/org/openslx/imagemaster/util/AsymMessageVerifier.java b/src/main/java/org/openslx/imagemaster/util/AsymMessageVerifier.java index d1629b9..e7e6be4 100644 --- a/src/main/java/org/openslx/imagemaster/util/AsymMessageVerifier.java +++ b/src/main/java/org/openslx/imagemaster/util/AsymMessageVerifier.java @@ -43,11 +43,10 @@ public class AsymMessageVerifier } /** - * Verify an encrypted message - * @param signedMessage The signed message from hs/uni server - * @param realMessage The message that was sent before - * @param alias the alias of the certificate - * @param password the password of the certificate + * Verify an encrypted message. + * + * @param messageDigest The signed message from hs/uni server + * @param expectedCleartext The message that was sent before * @return Whether the message could be verfied or not * @throws NoSuchAlgorithmException * @throws InvalidKeyException @@ -55,13 +54,13 @@ public class AsymMessageVerifier * @throws UnrecoverableKeyException * @throws KeyStoreException */ - public boolean verifyMessage( byte[] signedMessage, byte[] realMessage, String alias ) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException, UnrecoverableKeyException, KeyStoreException + public boolean verifyMessage( byte[] messageDigest, byte[] expectedCleartext ) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException, UnrecoverableKeyException, KeyStoreException { // verify message Signature signature = Signature.getInstance( "SHA256WITHRSA" ); signature.initVerify( key ); - signature.update( realMessage ); - return signature.verify( signedMessage ); + signature.update( expectedCleartext ); + return signature.verify( messageDigest ); } } -- cgit v1.2.3-55-g7522