test: move ed25519 keypair to fixtures/keys/

PR-URL: #27962 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Jun 17, 2019 · adb0197 · adb0197
1 parent 14bd26c
commit adb0197
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/test/fixtures/keys/.gitattributes b/test/fixtures/keys/.gitattributes
@@ -0,0 +1,4 @@
+* -text
+
+Makefile text
+*.cnf text
diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
@@ -43,6 +43,8 @@ all: \
   rsa_pss_public_2048.pem \
   rsa_pss_public_2048_sha256_sha256_16.pem \
   rsa_pss_public_2048_sha512_sha256_20.pem \
+  ed25519_private.pem \
+  ed25519_public.pem \
 
 #
 # Create Certificate Authority: ca1
@@ -598,6 +600,12 @@ rsa_pss_public_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.
 rsa_pss_public_2048_sha512_sha256_20.pem: rsa_pss_private_2048_sha512_sha256_20.pem
 	openssl pkey -in rsa_pss_private_2048_sha512_sha256_20.pem -pubout -out rsa_pss_public_2048_sha512_sha256_20.pem
 
+ed25519_private.pem:
+	openssl genpkey -algorithm ED25519 -out ed25519_private.pem
+
+ed25519_public.pem: ed25519_private.pem
+	openssl pkey -in ed25519_private.pem -pubout -out ed25519_public.pem
+
 clean:
 	rm -f *.pfx *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial *.print *.old fake-startcom-root-issued-certs/*.pem
 	@> fake-startcom-root-database.txt

diff --git a/test/fixtures/keys/ed25519_private.pem b/test/fixtures/keys/ed25519_private.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIMFSujN0jIUIdzSvuxka0lfgVVkMdRTuaVvIYUHrvzXQ
+-----END PRIVATE KEY-----
diff --git a/test/fixtures/keys/ed25519_public.pem b/test/fixtures/keys/ed25519_public.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MCowBQYDK2VwAyEAK1wIouqnuiA04b3WrMa+xKIKIpfHetNZRv3h9fBf768=
+-----END PUBLIC KEY-----
diff --git a/test/fixtures/test_ed25519_privkey.pem b/test/fixtures/test_ed25519_privkey.pem
diff --git a/test/fixtures/test_ed25519_pubkey.pem b/test/fixtures/test_ed25519_pubkey.pem
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
@@ -203,8 +203,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
 }
 
 [
-  { private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'),
-    public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'),
+  { private: fixtures.readKey('ed25519_private.pem', 'ascii'),
+    public: fixtures.readKey('ed25519_public.pem', 'ascii'),
     keyType: 'ed25519' },
   { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),
     public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'),

diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js
@@ -418,8 +418,8 @@ common.expectsError(
 }
 
 [
-  { private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'),
-    public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'),
+  { private: fixtures.readKey('ed25519_private.pem', 'ascii'),
+    public: fixtures.readKey('ed25519_public.pem', 'ascii'),
     algo: null,
     sigLen: 64 },
   { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),