Refactored SSLProtocolVariant

The SSLProtocolVariant has been moved out of SSLSocket into a separate class.
dogtagpki · Aug 8, 2018 · f4489ad · f4489ad
1 parent 5fcbfcc
commit f4489ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/org/mozilla/jss/ssl/SSLProtocolVariant.java b/org/mozilla/jss/ssl/SSLProtocolVariant.java
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.jss.ssl;
+
+public class SSLProtocolVariant {
+
+    public static final SSLProtocolVariant STREAM =
+        new SSLProtocolVariant(SocketBase.SSL_Variant_Stream);
+
+    public static final SSLProtocolVariant DATA_GRAM =
+        new SSLProtocolVariant(SocketBase.SSL_Variant_Datagram);
+
+    private int _enum;
+
+    private SSLProtocolVariant(int val) { _enum = val; }
+
+    int getEnum() { return _enum; }
+}
diff --git a/org/mozilla/jss/ssl/SSLSocket.java b/org/mozilla/jss/ssl/SSLSocket.java
@@ -1363,19 +1363,6 @@ public void useCacheDefault(boolean b) throws SocketException {
         setSSLDefaultOption(SocketBase.SSL_NO_CACHE, !b);
     }
 
-    public static class SSLProtocolVariant {
-        private int _enum;
-        private SSLProtocolVariant(int val) { _enum = val; }
-
-        int getEnum() { return _enum; }
-
-        public static final SSLProtocolVariant STREAM =
-            new SSLProtocolVariant(SocketBase.SSL_Variant_Stream);
-        public static final SSLProtocolVariant DATA_GRAM =
-            new SSLProtocolVariant(SocketBase.SSL_Variant_Datagram);
-
-    }
-
     public static void setSSLVersionRangeDefault(SSLProtocolVariant ssl_variant, SSLVersionRange range)
         throws SocketException
     {