aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYuuta Liang <yuutaw@students.cs.ubc.ca>2023-10-14 05:36:56 +0800
committerYuuta Liang <yuutaw@students.cs.ubc.ca>2023-10-14 05:36:56 +0800
commit6f82e5f3238bcc611354b20ed624d65759263032 (patch)
treeff21e0a38a5c18298a20693d34e0d0f331f3668b /src
parent28fa18278c1f3a87722d5e8b78f581526a30bb38 (diff)
downloadjca-6f82e5f3238bcc611354b20ed624d65759263032.tar
jca-6f82e5f3238bcc611354b20ed624d65759263032.tar.gz
jca-6f82e5f3238bcc611354b20ed624d65759263032.tar.bz2
jca-6f82e5f3238bcc611354b20ed624d65759263032.zip
Commit files that had not been synced to disk by Idea
Signed-off-by: Yuuta Liang <yuutaw@students.cs.ubc.ca>
Diffstat (limited to 'src')
-rw-r--r--src/main/model/asn1/ASN1Object.java33
-rw-r--r--src/main/ui/MainScreen.java2
2 files changed, 12 insertions, 23 deletions
diff --git a/src/main/model/asn1/ASN1Object.java b/src/main/model/asn1/ASN1Object.java
index 434a6c5..ca10fa6 100644
--- a/src/main/model/asn1/ASN1Object.java
+++ b/src/main/model/asn1/ASN1Object.java
@@ -110,28 +110,17 @@ public class ASN1Object implements Encodable {
public static ASN1Object parse(BytesReader encoded, boolean hasParentTag) throws ParseException {
final Tag t = encoded.getTag(hasParentTag);
switch (t.getNumber()) {
- case 0x1:
- return new Bool(encoded, hasParentTag);
- case 0x2:
- return new Int(encoded, hasParentTag);
- case 0x3:
- return new BitString(encoded, hasParentTag);
- case 0x4:
- return new OctetString(encoded, hasParentTag);
- case 0x5:
- return new Null(encoded, hasParentTag);
- case 0x6:
- return new ObjectIdentifier(encoded, hasParentTag);
- case 0xC:
- return new UTF8String(encoded, hasParentTag);
- case 0x13:
- return new PrintableString(encoded, hasParentTag);
- case 0x16:
- return new IA5String(encoded, hasParentTag);
- case 0x17:
- return new UtcTime(encoded, hasParentTag);
- case 0x18:
- return new GeneralizedTime(encoded, hasParentTag);
+ case 0x1: return new Bool(encoded, hasParentTag);
+ case 0x2: return new Int(encoded, hasParentTag);
+ case 0x3: return new BitString(encoded, hasParentTag);
+ case 0x4: return new OctetString(encoded, hasParentTag);
+ case 0x5: return new Null(encoded, hasParentTag);
+ case 0x6: return new ObjectIdentifier(encoded, hasParentTag);
+ case 0xC: return new UTF8String(encoded, hasParentTag);
+ case 0x13: return new PrintableString(encoded, hasParentTag);
+ case 0x16: return new IA5String(encoded, hasParentTag);
+ case 0x17: return new UtcTime(encoded, hasParentTag);
+ case 0x18: return new GeneralizedTime(encoded, hasParentTag);
default: {
ASN1Object object = new ASN1Object(encoded, hasParentTag);
// Mark as read unconditionally because there aren't any type handlers that read them.
diff --git a/src/main/ui/MainScreen.java b/src/main/ui/MainScreen.java
index f6abf8b..4d77022 100644
--- a/src/main/ui/MainScreen.java
+++ b/src/main/ui/MainScreen.java
@@ -141,7 +141,7 @@ public class MainScreen implements UIHandler {
out.write(Utils.byteToByte(c.encodeDER()));
out.close();
} catch (IllegalArgumentException ignored) {
- System.out.println("Illegal serial number or reason");
+ System.out.println("Illegal serial number");
} catch (IOException e) {
System.out.println(e.getMessage());
}