You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/01 20:32:36 UTC
directory-kerby git commit: Replace checks for AES256 available by
JUnit's Assume
Repository: directory-kerby
Updated Branches:
refs/heads/master efc2eed5b -> a51275960
Replace checks for AES256 available by JUnit's Assume
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a5127596
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a5127596
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a5127596
Branch: refs/heads/master
Commit: a512759608af67d22ffcd8fde427bee260fce08a
Parents: efc2eed
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Wed Jul 1 20:31:53 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Wed Jul 1 20:31:53 2015 +0200
----------------------------------------------------------------------
.../kerby/kerberos/kerb/crypto/CheckSumsTest.java | 5 ++---
.../kerby/kerberos/kerb/crypto/KeyDeriveTest.java | 13 ++++---------
2 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a5127596/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
index 3f2e52c..871f05b 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
@@ -27,6 +27,7 @@ import org.apache.kerby.util.HexUtil;
import org.junit.Test;
import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assume.assumeTrue;
/**
* These are to test the checksums of good answers, and the checksums
@@ -111,9 +112,7 @@ public class CheckSumsTest {
@Test
public void testCheckSums_HMAC_SHA1_96_AES256() throws Exception {
- if(!EncryptionHandler.isAES256Enabled()) {
- return;
- }
+ assumeTrue(EncryptionHandler.isAES256Enabled());
performTest(new CksumTest(
"fourteen",
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a5127596/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
index 085332d..eb17bfa 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
@@ -31,6 +31,7 @@ import org.junit.Test;
import java.util.Arrays;
import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assume.assumeTrue;
/**
* Key derivation test with known values.
@@ -121,9 +122,7 @@ public class KeyDeriveTest {
@Test
public void testKeyDerive_AES256_CTS_HMAC_SHA1_96_299() throws Exception {
- if(!EncryptionHandler.isAES256Enabled()) {
- return;
- }
+ assumeTrue(EncryptionHandler.isAES256Enabled());
performTest(new TestCase(
EncryptionType.AES256_CTS_HMAC_SHA1_96,
@@ -137,9 +136,7 @@ public class KeyDeriveTest {
@Test
public void testKeyDerive_AES256_CTS_HMAC_SHA1_96_2AA() throws Exception {
- if(!EncryptionHandler.isAES256Enabled()) {
- return;
- }
+ assumeTrue(EncryptionHandler.isAES256Enabled());
performTest(new TestCase(
EncryptionType.AES256_CTS_HMAC_SHA1_96,
@@ -153,9 +150,7 @@ public class KeyDeriveTest {
@Test
public void testKeyDerive_AES256_CTS_HMAC_SHA1_96_255() throws Exception {
- if(!EncryptionHandler.isAES256Enabled()) {
- return;
- }
+ assumeTrue(EncryptionHandler.isAES256Enabled());
performTest(new TestCase(
EncryptionType.AES256_CTS_HMAC_SHA1_96,