From e0199f23d78455f14054ef7c89f663841cca91c3 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Sat, 13 Jun 2020 15:44:15 +0200
Subject: [PATCH] Upgrade to go-openssl v4

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 Makefile | 11 +----------
 go.mod   |  2 +-
 go.sum   | 10 ++++++++++
 main.go  |  8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 403470b..7b18390 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-GO_VERSION=1.12.9
-TINYGO_VERSION=0.7.1
+GO_VERSION=1.14.3
 
 default: build_golang
 
@@ -8,11 +7,3 @@ build_golang:
 	GOOS=js GOARCH=wasm go build \
 			 -o example/openssl.wasm \
 			 main.go
-
-build_tinygo:
-	curl -fLo ./example/wasm_exec.js "https://github.com/tinygo-org/tinygo/blob/v${TINYGO_VERSION}/targets/wasm_exec.js"
-	tinygo build \
-		-o example/openssl.wasm \
-		-target wasm \
-		--no-debug \
-		main.go
diff --git a/go.mod b/go.mod
index d3f2cd4..dbb242c 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module github.com/Luzifer/wasm-openssl
 
 go 1.12
 
-require github.com/Luzifer/go-openssl/v3 v3.1.0
+require github.com/Luzifer/go-openssl/v4 v4.0.0
diff --git a/go.sum b/go.sum
index f91d632..25acd2e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,12 @@
+github.com/Luzifer/go-openssl v1.2.0 h1:vuvSxN845hEpMbNO0oGezXuxVxV6oemQgQ5QETKmOZk=
 github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw=
 github.com/Luzifer/go-openssl/v3 v3.1.0/go.mod h1:liy3FXuuS8hfDlYh1T+l78AwQ/NjZflJz0NDvjKhwDs=
+github.com/Luzifer/go-openssl/v4 v4.0.0 h1:52GaSYOd5Dz5tkwoDfh+XU70fxDcksxjyBj9+d43arY=
+github.com/Luzifer/go-openssl/v4 v4.0.0/go.mod h1:3i1T3Pe6eQK19d86WhuQzjLyMwBaNmGmt3ZceWpWVa4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
+golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/main.go b/main.go
index 0c27b28..a4d52bb 100644
--- a/main.go
+++ b/main.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"syscall/js"
 
-	openssl "github.com/Luzifer/go-openssl/v3"
+	openssl "github.com/Luzifer/go-openssl/v4"
 )
 
-var defaultKDF = openssl.DigestSHA256Sum
+var defaultCG = openssl.PBKDF2SHA256
 
 func main() {
 	js.Global().Set("opensslDecrypt", js.FuncOf(decrypt))
@@ -34,7 +34,7 @@ func decrypt(this js.Value, i []js.Value) interface{} {
 	)
 
 	o := openssl.New()
-	plaintext, err := o.DecryptBytes(password, []byte(ciphertext), defaultKDF)
+	plaintext, err := o.DecryptBytes(password, []byte(ciphertext), defaultCG)
 	if err != nil {
 		callback.Invoke(nil, fmt.Sprintf("decrypt failed: %s", err))
 		return nil
@@ -57,7 +57,7 @@ func encrypt(this js.Value, i []js.Value) interface{} {
 	)
 
 	o := openssl.New()
-	ciphertext, err := o.EncryptBytes(password, []byte(plaintext), defaultKDF)
+	ciphertext, err := o.EncryptBytes(password, []byte(plaintext), defaultCG)
 	if err != nil {
 		callback.Invoke(nil, fmt.Sprintf("encrypt failed: %s", err))
 		return nil