summarylogtreecommitdiffstats
path: root/lang3.patch
blob: 718844390a1b2bce72c3b28879fc6969c6a50fb9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
diff -Naur jss-4.6.3 jss-4.6.3-fixed
diff -Naur jss-4.6.3/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java jss-4.6.3-fixed/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java
--- jss-4.6.3/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java	2020-02-12 16:05:04.000000000 -0500
+++ jss-4.6.3-fixed/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java	2020-04-07 11:52:05.971642170 -0400
@@ -34,7 +34,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.ANY;
 import org.mozilla.jss.asn1.ASN1Value;
diff -Naur jss-4.6.3/org/mozilla/jss/netscape/security/util/Cert.java jss-4.6.3-fixed/org/mozilla/jss/netscape/security/util/Cert.java
--- jss-4.6.3/org/mozilla/jss/netscape/security/util/Cert.java	2020-02-12 16:05:04.000000000 -0500
+++ jss-4.6.3-fixed/org/mozilla/jss/netscape/security/util/Cert.java	2020-04-07 11:51:15.390240174 -0400
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.mozilla.jss.crypto.SignatureAlgorithm;
 import org.mozilla.jss.netscape.security.pkcs.PKCS7;
 import org.mozilla.jss.netscape.security.x509.X509CRLImpl;
diff -Naur jss-4.6.3/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java jss-4.6.3-fixed/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java
--- jss-4.6.3/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java	2020-02-12 16:05:04.000000000 -0500
+++ jss-4.6.3-fixed/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java	2020-04-07 11:51:15.390240174 -0400
@@ -19,7 +19,7 @@
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * The RevocationReasonAdapter class provides custom marshaling for RevocationReason.
diff -Naur jss-4.6.3/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java jss-4.6.3-fixed/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java
--- jss-4.6.3/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java	2020-02-12 16:05:04.000000000 -0500
+++ jss-4.6.3-fixed/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java	2020-04-07 11:51:15.400240452 -0400
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.NoSuchTokenException;
 import org.mozilla.jss.NotInitializedException;
diff -Naur jss-4.6.3/org/mozilla/jss/tests/UTF8ConverterTest.java jss-4.6.3-fixed/org/mozilla/jss/tests/UTF8ConverterTest.java
--- jss-4.6.3/org/mozilla/jss/tests/UTF8ConverterTest.java	2020-02-12 16:05:04.000000000 -0500
+++ jss-4.6.3-fixed/org/mozilla/jss/tests/UTF8ConverterTest.java	2020-04-07 11:51:15.410240729 -0400
@@ -6,7 +6,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.mozilla.jss.util.Assert;
 import org.mozilla.jss.util.UTF8Converter;