diff --git a/README.md b/README.md index eded68c2..f9b0f667 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ You can always use this project in your own code through Maven central, by addin org.tokenscript attestation - 0.3.14 + 0.3.15 ``` diff --git a/build.gradle b/build.gradle index 04b394a2..42e5fcd3 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation group: 'commons-cli', name: 'commons-cli', version: '[1.5.0, 2)' implementation group: 'com.google.code.gson', name: 'gson', version: '[2.9.0, 3)' testImplementation 'org.mockito:mockito-core:[4.4.0, 5)' - implementation 'com.fasterxml.jackson.core:jackson-databind' + implementation 'com.fasterxml.jackson.core:jackson-databind:[2.13.2.1,)' implementation group: 'org.java-websocket', name: 'Java-WebSocket' } @@ -163,7 +163,7 @@ task testJavaScript(type: NodeTask) { group = "org.tokenscript" archivesBaseName = "attestation" -version = "0.3.14" +version = "0.3.15" /** See https://docs.gradle.org/current/userguide/publishing_maven.html for details * For actually updating the Maven repo update the version reference in README.md, diff --git a/devcon.md b/devcon.md index 4e76c9c0..8a0ec1a6 100644 --- a/devcon.md +++ b/devcon.md @@ -63,4 +63,4 @@ The command will print `Ticket is VALID and was issued to email some@mail.dk` if For example: - java -cp attestation-0.3.14-all.jar org.devcon.ticket.Validator pub.pem MIGYMA8MATYCBwCMryzpzeQCAQAEQQQtqLOcLgwsajj19K141ER4A4fblUH-cH0ZM_HZQmylYiSxsPljEL--ldyfbPIslT7djTuYJakQdyapeuPpnEDjA0IA1LMfG8yWPpa2Yuyssn5fBB4MsNY3PpF0hwELzugBxw96zU4Q2k9jz5_L3Y3qIyshm8AH5EiIwm5k5LIZs3idghw= MIGqBEEECwGwPNcyCsaGTbr5_BVaThbVuQr7kUWGFI3XgT68kpMi3JGIuO5SCAX4C-ySQxSnQO-9qAZeUjYo7dfnyJiAuwQgLY3YogvmiVW8frt3wxbX9qIBqkgMTcoCdN8af7_QXCEEQQQWPq3mXaFk68AgZgOXq0ORy1XPeTicyazBHv7WGDa_3x-swwhLDW1q8JvvRfbi2t0juMdiEhiG4NgRF-4oOiIOBAA= some@mail.dk + java -cp attestation-0.3.15-all.jar org.devcon.ticket.Validator pub.pem MIGYMA8MATYCBwCMryzpzeQCAQAEQQQtqLOcLgwsajj19K141ER4A4fblUH-cH0ZM_HZQmylYiSxsPljEL--ldyfbPIslT7djTuYJakQdyapeuPpnEDjA0IA1LMfG8yWPpa2Yuyssn5fBB4MsNY3PpF0hwELzugBxw96zU4Q2k9jz5_L3Y3qIyshm8AH5EiIwm5k5LIZs3idghw= MIGqBEEECwGwPNcyCsaGTbr5_BVaThbVuQr7kUWGFI3XgT68kpMi3JGIuO5SCAX4C-ySQxSnQO-9qAZeUjYo7dfnyJiAuwQgLY3YogvmiVW8frt3wxbX9qIBqkgMTcoCdN8af7_QXCEEQQQWPq3mXaFk68AgZgOXq0ORy1XPeTicyazBHv7WGDa_3x-swwhLDW1q8JvvRfbi2t0juMdiEhiG4NgRF-4oOiIOBAA= some@mail.dk diff --git a/src/main/javascript/crypto/src/libs/Attestation.ts b/src/main/javascript/crypto/src/libs/Attestation.ts index 9df92bc5..5f4b753e 100644 --- a/src/main/javascript/crypto/src/libs/Attestation.ts +++ b/src/main/javascript/crypto/src/libs/Attestation.ts @@ -244,13 +244,13 @@ export class Attestation { if (this.notValidAfter != null && this.notValidBefore != null) { let date = Asn1Der.encode('GENERALIZED_TIME', this.notValidBefore); - // if (this.blockchainFriendly) { - // date += Asn1Der.encode('INTEGER', this.notValidBefore); - // } + if (this.blockchainFriendly) { + date += Asn1Der.encode('INTEGER', this.notValidBefore); + } date += Asn1Der.encode('GENERALIZED_TIME', this.notValidAfter); - // if (this.blockchainFriendly) { - // date += Asn1Der.encode('INTEGER', this.notValidAfter); - // } + if (this.blockchainFriendly) { + date += Asn1Der.encode('INTEGER', this.notValidAfter); + } res += Asn1Der.encode('SEQUENCE_30', date); } else { res += Asn1Der.encode('NULL_VALUE','');