--- sorted.warnings.before	2018-09-27 10:19:00.272819584 -0700
+++ sorted.warnings.after	2018-09-27 10:19:00.274819526 -0700
@@ -1,12 +1,12 @@
 ./org/mozilla/jss/netscape/security/x509/X509Cert.java:25: warning: [deprecation] Certificate in java.security has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:102: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:105: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:127: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:130: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:165: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
-./org/mozilla/jss/pkcs11/PK11Cipher.java:192: warning: [deprecation] isPadded() in EncryptionAlgorithm has been deprecated
+./org/mozilla/jss/pkcs11/CipherContextProxy.java:16: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/pkcs11/CipherContextProxy.java:17: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/pkcs11/KeyProxy.java:12: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/pkcs11/KeyProxy.java:13: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/pkcs11/ModuleProxy.java:16: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/pkcs11/ModuleProxy.java:17: warning: [deprecation] finalize() in NativeProxy has been deprecated
 ./org/mozilla/jss/pkcs11/PK11InternalTokenCert.java:16: warning: [deprecation] getUniqueID() in TokenCertificate has been deprecated
-./org/mozilla/jss/pkcs11/PK11PrivKey.java:43: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
+./org/mozilla/jss/pkcs11/PK11PrivKey.java:45: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
 ./org/mozilla/jss/pkcs11/PK11TokenCert.java:14: warning: [deprecation] getUniqueID() in TokenCertificate has been deprecated
 ./org/mozilla/jss/pkcs7/EncryptedContentInfo.java:185: warning: [deprecation] getParameterClass() in Algorithm has been deprecated
 ./org/mozilla/jss/pkcs7/EncryptedContentInfo.java:187: warning: [deprecation] getParameterClass() in Algorithm has been deprecated
@@ -18,11 +18,11 @@
 ./org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java:327: warning: [deprecation] getParameterClass() in Algorithm has been deprecated
 ./org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java:408: warning: [deprecation] getParameterClass() in Algorithm has been deprecated
 ./org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java:189: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
-./org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java:264: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
-./org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java:445: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
 ./org/mozilla/jss/provider/java/security/JSSSignatureSpi.java:167: warning: [deprecation] engineGetParameter(String) in SignatureSpi has been deprecated
 ./org/mozilla/jss/provider/java/security/JSSSignatureSpi.java:174: warning: [deprecation] engineSetParameter(String,Object) in SignatureSpi has been deprecated
 ./org/mozilla/jss/provider/java/security/KeyFactorySpi1_2.java:54: warning: [deprecation] fromRaw(Type,byte[]) in PK11PubKey has been deprecated
+./org/mozilla/jss/ssl/SocketProxy.java:15: warning: [deprecation] finalize() in NativeProxy has been deprecated
+./org/mozilla/jss/ssl/SocketProxy.java:16: warning: [deprecation] finalize() in NativeProxy has been deprecated
 ./org/mozilla/jss/ssl/SSLClient.java:375: warning: [deprecation] SSL3_RSA_WITH_RC4_128_MD5 in SSLSocket has been deprecated
 ./org/mozilla/jss/ssl/SSLClient.java:376: warning: [deprecation] SSL3_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
 ./org/mozilla/jss/ssl/SSLClient.java:377: warning: [deprecation] SSL3_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
@@ -31,15 +31,15 @@
 ./org/mozilla/jss/ssl/SSLServer.java:256: warning: [deprecation] SSL3_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
 ./org/mozilla/jss/ssl/SSLServer.java:257: warning: [deprecation] SSL3_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
 ./org/mozilla/jss/ssl/SSLServer.java:260: warning: [deprecation] SSL3_RSA_WITH_NULL_MD5 in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:108: warning: [deprecation] SSL3_RSA_WITH_NULL_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:109: warning: [deprecation] SSL3_RSA_WITH_NULL_MD5 in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:85: warning: [deprecation] SSL3_RSA_WITH_RC4_128_MD5 in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:86: warning: [deprecation] SSL3_RSA_WITH_RC4_128_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:90: warning: [deprecation] SSL3_DHE_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:91: warning: [deprecation] SSL3_DHE_DSS_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:95: warning: [deprecation] SSL3_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:96: warning: [deprecation] SSL3_DHE_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:97: warning: [deprecation] SSL3_DHE_DSS_WITH_DES_CBC_SHA in SSLSocket has been deprecated
-./org/mozilla/jss/tests/Constants.java:99: warning: [deprecation] SSL3_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:104: warning: [deprecation] SSL3_RSA_WITH_RC4_128_MD5 in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:105: warning: [deprecation] SSL3_RSA_WITH_RC4_128_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:109: warning: [deprecation] SSL3_DHE_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:110: warning: [deprecation] SSL3_DHE_DSS_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:114: warning: [deprecation] SSL3_RSA_WITH_3DES_EDE_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:115: warning: [deprecation] SSL3_DHE_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:116: warning: [deprecation] SSL3_DHE_DSS_WITH_DES_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:118: warning: [deprecation] SSL3_RSA_WITH_DES_CBC_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:127: warning: [deprecation] SSL3_RSA_WITH_NULL_SHA in SSLSocket has been deprecated
+./org/mozilla/jss/tests/Constants.java:128: warning: [deprecation] SSL3_RSA_WITH_NULL_MD5 in SSLSocket has been deprecated
 ./org/mozilla/jss/tests/KeyWrapping.java:86: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
 ./org/mozilla/jss/tests/KeyWrapping.java:95: warning: [deprecation] getUniqueID() in PrivateKey has been deprecated
