hatter/yubikey-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: opt pktype

Browse Source
This commit is contained in:
Hatter Jiang
2023-05-21 16:52:04 +08:00
parent fb04fc6b6a
commit d91266644d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yubikey-ca-java/build.json
View File

@@ -13,7 +13,7 @@
"repo": { "repo": {
"dependencies": [ "dependencies": [
"info.picocli:picocli:4.6.1", "info.picocli:picocli:4.6.1",
"me.hatter:commons:3.67", "me.hatter:commons:3.68",
"me.hatter:crypto:1.12" "me.hatter:crypto:1.12"
], ],
"testDependencies": [ "testDependencies": [

9
yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/YubikeyCaMain.java
View File

@@ -17,7 +17,6 @@ import me.hatter.tools.yubikeyca.hatterink.CertificateUtil;
import java.security.KeyPair; import java.security.KeyPair;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional;
public class YubikeyCaMain { public class YubikeyCaMain {
private static final LogTool log; private static final LogTool log;
@@ -178,13 +177,11 @@ public class YubikeyCaMain {
log.error("Keypair type is required."); log.error("Keypair type is required.");
return null; return null;
} }
final Optional<PKType> pkTypeOpt = Arrays.stream(PKType.values()) final PKType pkType = PKType.from(args.keypairType);
.filter(t -> t.name().equalsIgnoreCase(args.keypairType)) if (pkType == null) {
.findFirst();
if (!pkTypeOpt.isPresent()) {
log.error("Invalid keypair type: " + args.keypairType); log.error("Invalid keypair type: " + args.keypairType);
return null; return null;
} }
return pkTypeOpt.get(); return pkType;
} }
} }