Skip to content

Commit

Permalink
1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JesusMcCloud committed Mar 12, 2024
1 parent 3ccd547 commit 79a5bb1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,8 @@ out the attestation record.
- Napier 2.7.1
- Guava 33.0.0-jre
- Error Prone 2.24.1
- (NEW) AutoValue 1.10.4
- (NEW) AutoValue 1.10.4

#### 1.5.1
- dependency updated
- correctly expose guava as api dependency
4 changes: 2 additions & 2 deletions android-attestation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import at.asitplus.gradle.ktor
import org.gradle.kotlin.dsl.support.listFilesOrdered

group = "at.asitplus"
version = "1.5.0"
version = "1.5.1"

plugins {
kotlin("jvm")
Expand Down Expand Up @@ -45,7 +45,7 @@ dependencies {
implementation(ktor("serialization-kotlinx-json"))
implementation(ktor("client-cio"))
implementation("com.google.errorprone:error_prone_annotations:2.24.1")
implementation("com.google.guava:guava:33.0.0-jre")
api("com.google.guava:guava:33.0.0-jre")
implementation("com.google.auto.value:auto-value-annotations:1.10.4")
annotationProcessor ("com.google.auto.value:auto-value:1.10.4")
api("com.google.protobuf:protobuf-javalite:3.25.1")
Expand Down
6 changes: 4 additions & 2 deletions android-attestation/src/test/kotlin/data/AttestationData.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ internal val rsaKeyFactory = KeyFactory.getInstance("RSA")
class AttestationData(
val name: String, challengeB64: String, val attestationProofB64: List<String>,
isoDate: String,
pubKeyB64: String? = null
pubKeyB64: String? = null,
val packageOverride: String? = null,
val isProductionOverride: Boolean? = null
) {

val verificationDate: Date = Date.from(Instant.parse(isoDate))
Expand All @@ -28,7 +30,7 @@ class AttestationData(

val publicKey: PublicKey? by lazy {
pubKeyB64?.let { mimeDecoder.decode(it) }
?.let { (if (it.size < 1024) ecKeyFactory else rsaKeyFactory).generatePublic(X509EncodedKeySpec(it)) }
?.let { (if (it.size < 2048) ecKeyFactory else rsaKeyFactory).generatePublic(X509EncodedKeySpec(it)) }
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins { id("at.asitplus.gradle.conventions") version "1.9.22+20240115" }
plugins { id("at.asitplus.gradle.conventions") version "1.9.22+20240301" }

group = "at.asitplus"

0 comments on commit 79a5bb1

Please sign in to comment.