rsa: use web platform tests checkout approach

grafana · Oct 25, 2024 · 6813847 · 6813847
1 parent f98c46b
commit 6813847
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 1,624 deletions.
diff --git a/webcrypto/jwk.go b/webcrypto/jwk.go
@@ -414,6 +414,9 @@ func exportRSAJWK(key *CryptoKey) (interface{}, error) {
 		exported.Set("dp", base64URLEncode(rsaKey.Precomputed.Dp.Bytes()))
 		exported.Set("dq", base64URLEncode(rsaKey.Precomputed.Dq.Bytes()))
 		exported.Set("qi", base64URLEncode(rsaKey.Precomputed.Qinv.Bytes()))
+	case *rsa.PublicKey:
+		exported.Set("n", base64URLEncode(rsaKey.N.Bytes()))
+		exported.Set("e", base64URLEncode(big.NewInt(int64(rsaKey.E)).Bytes()))
 	case rsa.PublicKey:
 		exported.Set("n", base64URLEncode(rsaKey.N.Bytes()))
 		exported.Set("e", base64URLEncode(big.NewInt(int64(rsaKey.E)).Bytes()))

diff --git a/webcrypto/subtle_crypto_test.go b/webcrypto/subtle_crypto_test.go
@@ -112,12 +112,14 @@ func TestSubtleCryptoImportExportKey(t *testing.T) {
 	t.Run("rsa", func(t *testing.T) {
 		t.Parallel()
 
-		ts := newConfiguredRuntime(t)
+		ts := newWebPlatformTestRuntime(t)
 
 		gotErr := ts.EventLoop.Start(func() error {
-			err := executeTestScripts(ts.VU.Runtime(), "./tests/import_export", "rsa_importKey.js")
-
-			return err
+			return executeTestScripts(
+				ts.VU.Runtime(),
+				webPlatformTestSuite+"import_export",
+				"rsa_importKey.https.any.js",
+			)
 		})
 
 		assert.NoError(t, gotErr)
@@ -185,10 +187,10 @@ func TestSubtleCryptoEncryptDecrypt(t *testing.T) {
 	t.Run("RSA-OAEP", func(t *testing.T) {
 		t.Parallel()
 
-		ts := newConfiguredRuntime(t)
+		ts := newWebPlatformTestRuntime(t)
 
 		gotErr := ts.EventLoop.Start(func() error {
-			err := executeTestScripts(ts.VU.Runtime(), "./tests/encrypt_decrypt", "rsa_vectors.js", "rsa.js")
+			err := executeTestScripts(ts.VU.Runtime(), webPlatformTestSuite+"encrypt_decrypt", "rsa_vectors.js", "rsa.js")
 			require.NoError(t, err)
 
 			_, err = ts.VU.Runtime().RunString(`run_test()`)
@@ -240,10 +242,10 @@ func TestSubtleCryptoSignVerify(t *testing.T) {
 	t.Run("RSA-PKCS", func(t *testing.T) {
 		t.Parallel()
 
-		ts := newConfiguredRuntime(t)
+		ts := newWebPlatformTestRuntime(t)
 
 		gotErr := ts.EventLoop.Start(func() error {
-			err := executeTestScripts(ts.VU.Runtime(), "./tests/sign_verify", "rsa_pkcs_vectors.js", "rsa.js")
+			err := executeTestScripts(ts.VU.Runtime(), webPlatformTestSuite+"sign_verify", "rsa_pkcs_vectors.js", "rsa.js")
 			require.NoError(t, err)
 
 			_, err = ts.VU.Runtime().RunString(`run_test()`)
@@ -257,10 +259,10 @@ func TestSubtleCryptoSignVerify(t *testing.T) {
 	t.Run("RSA-PSS", func(t *testing.T) {
 		t.Parallel()
 
-		ts := newConfiguredRuntime(t)
+		ts := newWebPlatformTestRuntime(t)
 
 		gotErr := ts.EventLoop.Start(func() error {
-			err := executeTestScripts(ts.VU.Runtime(), "./tests/sign_verify", "rsa_pss_vectors.js", "rsa.js")
+			err := executeTestScripts(ts.VU.Runtime(), webPlatformTestSuite+"sign_verify", "rsa_pss_vectors.js", "rsa.js")
 			require.NoError(t, err)
 
 			_, err = ts.VU.Runtime().RunString(`run_test()`)

diff --git a/webcrypto/tests/encrypt_decrypt/rsa.js b/webcrypto/tests/encrypt_decrypt/rsa.js
diff --git a/webcrypto/tests/encrypt_decrypt/rsa_vectors.js b/webcrypto/tests/encrypt_decrypt/rsa_vectors.js
diff --git a/webcrypto/tests/import_export/rsa_importKey.js b/webcrypto/tests/import_export/rsa_importKey.js
diff --git a/webcrypto/tests/sign_verify/rsa.js b/webcrypto/tests/sign_verify/rsa.js
diff --git a/webcrypto/tests/sign_verify/rsa_pkcs_vectors.js b/webcrypto/tests/sign_verify/rsa_pkcs_vectors.js