From c9ce7de5ff3aef580d8d0b30b19bbfb556940060 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Tue, 4 Nov 2014 22:31:48 +0200
Subject: [PATCH] Comments java.util.Base64 out of the CryptoBenchmark because
it is not available in Java 6.
---
.../impl/neomedia/transform/srtp/CryptoBenchmark.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java b/src/org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java
index 0a2c9a6c..a74bf986 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java
@@ -137,7 +137,7 @@ else if ("-nio-block-cipher".equalsIgnoreCase(arg))
long time0 = 0;
int dMax = Math.max(digests.length, messageDigests.length);
final int iEnd = 1000, jEnd = 1000;
- Base64.Encoder byteEncoder = Base64.getEncoder().withoutPadding();
+// Base64.Encoder byteEncoder = Base64.getEncoder().withoutPadding();
inNIO.order(ByteOrder.nativeOrder());
outNIO.order(ByteOrder.nativeOrder());
@@ -244,7 +244,7 @@ else if (cipher != null && benchmarkJavaxCryptoCipher)
clazz.getName() + ": ratio "
+ String.format("%.2f", time / (double) time0)
+ ", time " + time + ", out "
- + byteEncoder.encodeToString(out) + ".");
+ /*+ byteEncoder.encodeToString(out)*/ + ".");
}
// org.bouncycastle.crypto.Digest & java.security.MessageDigest
@@ -286,7 +286,7 @@ else if (cipher != null && benchmarkJavaxCryptoCipher)
digest.getClass().getName() + ": ratio "
+ String.format("%.2f", time / (double) time0)
+ ", time " + time + ", digest "
- + byteEncoder.encodeToString(out) + ".");
+ /*+ byteEncoder.encodeToString(out)*/ + ".");
}
// java.security.MessageDigest
@@ -295,6 +295,7 @@ else if (cipher != null && benchmarkJavaxCryptoCipher)
if (messageDigest != null)
{
+ @SuppressWarnings("unused")
byte[] t = null;
startTime = System.nanoTime();
@@ -318,7 +319,7 @@ else if (cipher != null && benchmarkJavaxCryptoCipher)
+ ": ratio "
+ String.format("%.2f", time / (double) time0)
+ ", time " + (endTime - startTime)
- + ", digest " + byteEncoder.encodeToString(t)
+ + ", digest " /*+ byteEncoder.encodeToString(t)*/
+ ".");
}
}
@@ -353,7 +354,7 @@ else if (cipher != null && benchmarkJavaxCryptoCipher)
mac.getClass().getName() + ": ratio "
+ String.format("%.2f", time / (double) time0)
+ ", time " + time + ", out "
- + byteEncoder.encodeToString(out) + ".");
+ /*+ byteEncoder.encodeToString(out)*/ + ".");
}
}
}
--
GitLab