Skip to content

Commit

Permalink
Refactored CipherPolicy
Browse files Browse the repository at this point in the history
The CipherPolicy has been moved out of SSLSocket into a separate
class.
  • Loading branch information
edewata committed Aug 8, 2018
1 parent f4489ad commit f0e1fac
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 15 deletions.
23 changes: 23 additions & 0 deletions org/mozilla/jss/ssl/CipherPolicy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* 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 CipherPolicy {

public static final CipherPolicy DOMESTIC =
new CipherPolicy(SocketBase.SSL_POLICY_DOMESTIC);

public static final CipherPolicy EXPORT =
new CipherPolicy(SocketBase.SSL_POLICY_EXPORT);

public static final CipherPolicy FRANCE =
new CipherPolicy(SocketBase.SSL_POLICY_FRANCE);

private int _enum;

private CipherPolicy(int _enum) { }

int getEnum() { return _enum; }
}
15 changes: 0 additions & 15 deletions org/mozilla/jss/ssl/SSLSocket.java
Original file line number Diff line number Diff line change
Expand Up @@ -1533,21 +1533,6 @@ protected void finalize() throws Throwable {
close(); /* in case user did not call close */
}

public static class CipherPolicy {
private int _enum;
private CipherPolicy(int _enum) { }

int getEnum() { return _enum; }

public static final CipherPolicy DOMESTIC =
new CipherPolicy(SocketBase.SSL_POLICY_DOMESTIC);
public static final CipherPolicy EXPORT =
new CipherPolicy(SocketBase.SSL_POLICY_EXPORT);
public static final CipherPolicy FRANCE =
new CipherPolicy(SocketBase.SSL_POLICY_FRANCE);

}

/**
* Sets the SSL cipher policy. This must be called before creating any
* SSL sockets.
Expand Down

0 comments on commit f0e1fac

Please sign in to comment.