michael-o commented on code in PR #674:
URL: https://github.com/apache/tomcat/pull/674#discussion_r1369136617
##########
java/org/apache/tomcat/util/net/jsse/PEMFile.java:
##########
@@ -64,8 +66,40 @@ public class PEMFile {
private static final byte[] OID_EC_PUBLIC_KEY =
new byte[] { 0x06, 0x07, 0x2A, (byte) 0x86, 0x48, (byte) 0xCE,
0x3D, 0x02, 0x01 };
+ // 1.2.840.113549.1.5.13
+ private static final byte[] OID_PBES2 =
+ new byte[] { 0x2A, (byte) 0x86, 0x48, (byte) 0x86, (byte) 0xF7,
0x0D, 0x01, 0x05, 0x0D };
+ // 1.2.840.113549.1.5.12
+ private static final byte[] OID_PBKDF2 =
+ new byte[] { 0x2A, (byte) 0x86, 0x48, (byte) 0x86, (byte) 0xF7,
0x0D, 0x01, 0x05, 0x0C };
+
+ private static final Map<String,String> OID_TO_PRF = new HashMap<>();
+ static {
+ // 1.2.840.113549.2.7
+ OID_TO_PRF.put("2a864886f70d0207", "HmacSHA1");
+ // 1.2.840.113549.2.8
+ OID_TO_PRF.put("2a864886f70d0208", "HmacSHA224");
+ // 1.2.840.113549.2.9
+ OID_TO_PRF.put("2a864886f70d0209", "HmacSHA256");
+ // 1.2.840.113549.2.10
+ OID_TO_PRF.put("2a864886f70d020a", "HmacSHA384");
+ // 1.2.840.113549.2.11
+ OID_TO_PRF.put("2a864886f70d020b", "HmacSHA512");
+ // 1.2.840.113549.2.12
+ OID_TO_PRF.put("2a864886f70d020c", "HmacSHA512/224");
+ // 1.2.840.113549.2.13
+ OID_TO_PRF.put("2a864886f70d020d", "HmacSHA512/256");
+ }
- private static final String PBES2 = "PBES2";
+ private static final Map<String,Algorithm> OID_TO_ALGOITHM = new
HashMap<>();
Review Comment:
Typo
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
