summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/util
diff options
context:
space:
mode:
authorSimon Rettberg2014-07-07 15:12:44 +0200
committerSimon Rettberg2014-07-07 15:12:44 +0200
commitdaa49262e30bfa3e10f411c18a2034ca48dcb3c2 (patch)
tree3108962e085b10e053d6a3c9e96692c683f75653 /src/main/java/org/openslx/imagemaster/util
parentAdd port to up- and download thingis (diff)
downloadmasterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.gz
masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.xz
masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.zip
more TODOs
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/util')
-rw-r--r--src/main/java/org/openslx/imagemaster/util/AsymMessageVerifier.java15
1 files changed, 7 insertions, 8 deletions
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 );
}
}