2 Commits

Author SHA1 Message Date
sstone
6a67dbe9f6 signatureNormalize: relax check on signature size
Checking that the sig size is >= 64 is enough, this is just a quick check before the actual library method is called.
2020-09-10 20:21:58 +02:00
Salomon BRYS
7272a55b8a Changed deployment artifact-id to secp256k1-kmp (#12)
Co-authored-by: Salomon BRYS <salomon@kodein.net>
2020-09-09 11:00:04 +02:00
10 changed files with 11 additions and 11 deletions

View File

@@ -25,7 +25,7 @@ buildscript {
allprojects { allprojects {
group = "fr.acinq.secp256k1" group = "fr.acinq.secp256k1"
version = "0.3.0" version = "0.4.0"
repositories { repositories {
jcenter() jcenter()

View File

@@ -51,7 +51,7 @@ afterEvaluate {
publishing { publishing {
publications { publications {
create<MavenPublication>("android") { create<MavenPublication>("android") {
artifactId = "secp256k1-jni-android" artifactId = "secp256k1-kmp-jni-android"
from(components["release"]) from(components["release"])
} }
} }

View File

@@ -34,7 +34,7 @@ val generateHeaders by tasks.creating(JavaCompile::class) {
publishing { publishing {
publications { publications {
create<MavenPublication>("jvm") { create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-common" artifactId = "secp256k1-kmp-jni-common"
from(components["java"]) from(components["java"])
} }
} }

View File

@@ -12,7 +12,7 @@ dependencies {
publishing { publishing {
publications { publications {
create<MavenPublication>("jvm") { create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-jvm" artifactId = "secp256k1-kmp-jni-jvm"
from(components["java"]) from(components["java"])
} }
} }

View File

@@ -33,7 +33,7 @@ dependencies {
publishing { publishing {
publications { publications {
create<MavenPublication>("jvm") { create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-jvm-extract" artifactId = "secp256k1-kmp-jni-jvm-extract"
from(components["java"]) from(components["java"])
} }
} }

View File

@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
publishing { publishing {
publications { publications {
val pub = create<MavenPublication>("jvm") { val pub = create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-jvm-darwin" artifactId = "secp256k1-kmp-jni-jvm-darwin"
from(components["java"]) from(components["java"])
} }
if (!org.gradle.internal.os.OperatingSystem.current().isMacOsX) { if (!org.gradle.internal.os.OperatingSystem.current().isMacOsX) {

View File

@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
publishing { publishing {
publications { publications {
val pub = create<MavenPublication>("jvm") { val pub = create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-jvm-linux" artifactId = "secp256k1-kmp-jni-jvm-linux"
from(components["java"]) from(components["java"])
} }
if (!org.gradle.internal.os.OperatingSystem.current().isLinux) { if (!org.gradle.internal.os.OperatingSystem.current().isLinux) {

View File

@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
publishing { publishing {
publications { publications {
val pub = create<MavenPublication>("jvm") { val pub = create<MavenPublication>("jvm") {
artifactId = "secp256k1-jni-jvm-mingw" artifactId = "secp256k1-kmp-jni-jvm-mingw"
from(components["java"]) from(components["java"])
} }
if (!org.gradle.internal.os.OperatingSystem.current().isWindows) { if (!org.gradle.internal.os.OperatingSystem.current().isWindows) {

View File

@@ -5,7 +5,7 @@ pluginManagement {
jcenter() jcenter()
} }
} }
rootProject.name = "secp256k1" rootProject.name = "secp256k1-kmp"
include( include(
":native", ":native",
@@ -17,4 +17,4 @@ include(
":jni:jvm:mingw", ":jni:jvm:mingw",
":jni:jvm:all", ":jni:jvm:all",
":tests" ":tests"
) )

View File

@@ -79,7 +79,7 @@ public object Secp256k1Native : Secp256k1 {
} }
public override fun signatureNormalize(sig: ByteArray): Pair<ByteArray, Boolean> { public override fun signatureNormalize(sig: ByteArray): Pair<ByteArray, Boolean> {
require(sig.size == 64 || sig.size in 70..73) require(sig.size >= 64){ "invalid signature ${Hex.encode(sig)}" }
memScoped { memScoped {
val nSig = allocSignature(sig) val nSig = allocSignature(sig)
val isHighS = secp256k1_ecdsa_signature_normalize(ctx, nSig.ptr, nSig.ptr) val isHighS = secp256k1_ecdsa_signature_normalize(ctx, nSig.ptr, nSig.ptr)