equal
deleted
inserted
replaced
1316 private static String getCompatibleSigAlgName(String keyAlgName) |
1316 private static String getCompatibleSigAlgName(String keyAlgName) |
1317 throws Exception { |
1317 throws Exception { |
1318 if ("DSA".equalsIgnoreCase(keyAlgName)) { |
1318 if ("DSA".equalsIgnoreCase(keyAlgName)) { |
1319 return "SHA1WithDSA"; |
1319 return "SHA1WithDSA"; |
1320 } else if ("RSA".equalsIgnoreCase(keyAlgName)) { |
1320 } else if ("RSA".equalsIgnoreCase(keyAlgName)) { |
1321 return "SHA1WithRSA"; |
1321 return "SHA256WithRSA"; |
1322 } else if ("EC".equalsIgnoreCase(keyAlgName)) { |
1322 } else if ("EC".equalsIgnoreCase(keyAlgName)) { |
1323 return "SHA1withECDSA"; |
1323 return "SHA1withECDSA"; |
1324 } else { |
1324 } else { |
1325 throw new Exception(rb.getString |
1325 throw new Exception(rb.getString |
1326 ("Cannot derive signature algorithm")); |
1326 ("Cannot derive signature algorithm")); |
1334 throws Exception |
1334 throws Exception |
1335 { |
1335 { |
1336 if (keysize == -1) { |
1336 if (keysize == -1) { |
1337 if ("EC".equalsIgnoreCase(keyAlgName)) { |
1337 if ("EC".equalsIgnoreCase(keyAlgName)) { |
1338 keysize = 256; |
1338 keysize = 256; |
|
1339 } else if ("RSA".equalsIgnoreCase(keyAlgName)) { |
|
1340 keysize = 2048; |
1339 } else { |
1341 } else { |
1340 keysize = 1024; |
1342 keysize = 1024; |
1341 } |
1343 } |
1342 } |
1344 } |
1343 |
1345 |
2497 cert.getSerialNumber().toString(16), |
2499 cert.getSerialNumber().toString(16), |
2498 cert.getNotBefore().toString(), |
2500 cert.getNotBefore().toString(), |
2499 cert.getNotAfter().toString(), |
2501 cert.getNotAfter().toString(), |
2500 getCertFingerPrint("MD5", cert), |
2502 getCertFingerPrint("MD5", cert), |
2501 getCertFingerPrint("SHA1", cert), |
2503 getCertFingerPrint("SHA1", cert), |
|
2504 getCertFingerPrint("SHA-256", cert), |
2502 cert.getSigAlgName(), |
2505 cert.getSigAlgName(), |
2503 cert.getVersion() |
2506 cert.getVersion() |
2504 }; |
2507 }; |
2505 out.println(form.format(source)); |
2508 out.println(form.format(source)); |
2506 |
2509 |