From ef2d585bdcf12e6ba1aa1ded6a5cf80e4a79b568 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Mon, 14 Sep 2015 03:35:13 -0700
Subject: Add more debugging to the DigestTest

This test sometimes fails, but we don't know what the coefficient of
variation is on the test results. Add this to the debug output so we can
see if there is just some wild swing during testing.

Also add a few rounds of warm-up as well.

Bug: 24011092
Change-Id: Ic58f106f68eb93976e3f030e2f23e0156fe84be8
(cherry picked from commit 5fe1cd001f38fba460ac0ce5c15b85250e400f25)
---
 .../test/java/tests/util/SummaryStatistics.java    | 82 ++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 support/src/test/java/tests/util/SummaryStatistics.java

(limited to 'support/src')

diff --git a/support/src/test/java/tests/util/SummaryStatistics.java b/support/src/test/java/tests/util/SummaryStatistics.java
new file mode 100644
index 0000000..4ce0a04
--- /dev/null
+++ b/support/src/test/java/tests/util/SummaryStatistics.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tests.util;
+
+public class SummaryStatistics {
+  /** The number of values seen. */
+  private int numValues;
+
+  /** Sum of the values. */
+  private double sum;
+
+  /** Sum of the squares of the values added. */
+  private double squaresSum;
+
+  /** The previously added value. */
+  private double lastValue;
+
+  public SummaryStatistics() {
+  }
+
+  private double square(double value) {
+    return value * value;
+  }
+
+  /** Add a new value to the values seen. */
+  public void add(double value) {
+    sum += value - lastValue;
+    squaresSum += square(value) - square(lastValue);
+    numValues++;
+    lastValue = value;
+  }
+
+  /** Mean of the values seen. */
+  public double mean() {
+    return sum / numValues;
+  }
+
+  /** Variance of the values seen. */
+  public double var() {
+    return (squaresSum / numValues) - square(mean());
+  }
+
+  /** Standard deviation of the values seen. */
+  public double stddev() {
+    return Math.sqrt(var());
+  }
+
+  /** Coefficient of variation of the values seen. */
+  public double coeffVar() {
+    return stddev() / mean();
+  }
+
+  public String toString() {
+    StringBuilder sb = new StringBuilder("SummaryStatistics{");
+    sb.append("n=");
+    sb.append(numValues);
+    sb.append(",mean=");
+    sb.append(mean());
+    sb.append(",var=");
+    sb.append(var());
+    sb.append(",stddev=");
+    sb.append(stddev());
+    sb.append(",coeffVar=");
+    sb.append(coeffVar());
+    sb.append('}');
+    return sb.toString();
+  }
+}
-- 
cgit v1.1


From e7bdc26218b2f0fa323778de1ff1449f4c5f5a52 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Wed, 6 Jan 2016 10:02:28 -0800
Subject: Check for RFC 5746 TLS extension

RFC 5746 allows you to either include a signaling cipher suite or a TLS
extension. However, since TLS API has no way to indicate or check that
a certain TLS extension is used, we insert it into the cipher suites
we see to check against the enabled cipher suites.

(cherry picked from commit 81885494e46596c796cdcb5037b91d92915b65a7)

Bug: 24602368
Change-Id: I06422b9a90f47bb5ffa10ef614233d856773d336
---
 support/src/test/java/libcore/tlswire/handshake/HelloExtension.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'support/src')

diff --git a/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java b/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java
index 5741072..a648cdf 100644
--- a/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java
+++ b/support/src/test/java/libcore/tlswire/handshake/HelloExtension.java
@@ -31,6 +31,7 @@ public class HelloExtension {
     public static final int TYPE_SERVER_NAME = 0;
     public static final int TYPE_PADDING = 21;
     public static final int TYPE_SESSION_TICKET = 35;
+    public static final int TYPE_RENEGOTIATION_INFO = 65281;
 
     private static final Map<Integer, String> TYPE_TO_NAME = new HashMap<Integer, String>();
     static {
@@ -60,7 +61,7 @@ public class HelloExtension {
         TYPE_TO_NAME.put(13172, "next_protocol_negotiation");
         TYPE_TO_NAME.put(30031, "Channel ID (old)");
         TYPE_TO_NAME.put(30032, "Channel ID (new)");
-        TYPE_TO_NAME.put(65281, "renegotiation_info");
+        TYPE_TO_NAME.put(TYPE_RENEGOTIATION_INFO, "renegotiation_info");
     }
 
     public int type;
-- 
cgit v1.1