diff options
Diffstat (limited to 'luni/src/main/java/javax')
| -rw-r--r-- | luni/src/main/java/javax/crypto/SealedObject.java | 2 | ||||
| -rw-r--r-- | luni/src/main/java/javax/crypto/spec/SecretKeySpec.java | 2 | ||||
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLSocketFactory.java | 8 |
3 files changed, 0 insertions, 12 deletions
diff --git a/luni/src/main/java/javax/crypto/SealedObject.java b/luni/src/main/java/javax/crypto/SealedObject.java index c6f8221..c9c1534 100644 --- a/luni/src/main/java/javax/crypto/SealedObject.java +++ b/luni/src/main/java/javax/crypto/SealedObject.java @@ -146,11 +146,9 @@ public class SealedObject implements Serializable { public final Object getObject(Key key) throws IOException, ClassNotFoundException, NoSuchAlgorithmException, InvalidKeyException { - // BEGIN android-added if (key == null) { throw new InvalidKeyException("key == null"); } - // END android-added try { Cipher cipher = Cipher.getInstance(sealAlg); if ((paramsAlg != null) && (paramsAlg.length() != 0)) { diff --git a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java index 99701ff..cb70643 100644 --- a/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java +++ b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java @@ -98,11 +98,9 @@ public class SecretKeySpec implements SecretKey, KeySpec, Serializable { if (key.length == 0) { throw new IllegalArgumentException("key.length == 0"); } - // BEGIN android-changed if (len < 0 || offset < 0) { throw new ArrayIndexOutOfBoundsException("len < 0 || offset < 0"); } - // END android-changed if (key.length - offset < len) { throw new IllegalArgumentException("key too short"); } diff --git a/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java b/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java index 75f918e..1f3aa42 100644 --- a/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java +++ b/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java @@ -44,9 +44,6 @@ public abstract class SSLSocketFactory extends SocketFactory { */ public static synchronized SocketFactory getDefault() { if (defaultSocketFactory != null) { - // BEGIN android-added - // log("SSLSocketFactory", "Using factory " + defaultSocketFactory, null); - // END android-added return defaultSocketFactory; } if (defaultName == null) { @@ -80,18 +77,13 @@ public abstract class SSLSocketFactory extends SocketFactory { // Use internal implementation defaultSocketFactory = new DefaultSSLSocketFactory("No SSLSocketFactory installed"); } - // BEGIN android-added - // log("SSLSocketFactory", "Using factory " + defaultSocketFactory, null); - // END android-added return defaultSocketFactory; } - // BEGIN android-added @SuppressWarnings("unchecked") private static void log(String tag, String msg, Throwable throwable) { Logger.getLogger(tag).log(Level.INFO, msg, throwable); } - // END android-added /** * Creates a new {@code SSLSocketFactory}. |