test: move x25519 keypair to fixtures/keys/

reasonablytall · BridgeAR · commit 7ae23abc015f · 2019-06-17T21:12:14.000+02:00
PR-URL: #27962 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
@@ -45,6 +45,8 @@ all: \
   rsa_pss_public_2048_sha512_sha256_20.pem \
   ed25519_private.pem \
   ed25519_public.pem \
+  x25519_private.pem \
+  x25519_public.pem \
 
 #
 # Create Certificate Authority: ca1
@@ -606,6 +608,12 @@ ed25519_private.pem:
 ed25519_public.pem: ed25519_private.pem
 	openssl pkey -in ed25519_private.pem -pubout -out ed25519_public.pem
 
+x25519_private.pem:
+	openssl genpkey -algorithm x25519 -out x25519_private.pem
+
+x25519_public.pem: x25519_private.pem
+	openssl pkey -in x25519_private.pem -pubout -out x25519_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/x25519_private.pem b/test/fixtures/keys/x25519_private.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VuBCIEIJi/yFpueUawC1BkXyWM8ONIBGFjL7UZHrD/Zo/KPDpn
+-----END PRIVATE KEY-----
diff --git a/test/fixtures/keys/x25519_public.pem b/test/fixtures/keys/x25519_public.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MCowBQYDK2VuAyEAaSb8Q+RndwfNnPeOYGYPDUN3uhAPnMLzXyfi+mqfhig=
+-----END PUBLIC KEY-----
diff --git a/test/fixtures/test_x25519_privkey.pem b/test/fixtures/test_x25519_privkey.pem
diff --git a/test/fixtures/test_x25519_pubkey.pem b/test/fixtures/test_x25519_pubkey.pem
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
@@ -209,8 +209,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
   { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),
     public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'),
     keyType: 'ed448' },
-  { private: fixtures.readSync('test_x25519_privkey.pem', 'ascii'),
-    public: fixtures.readSync('test_x25519_pubkey.pem', 'ascii'),
+  { private: fixtures.readKey('x25519_private.pem', 'ascii'),
+    public: fixtures.readKey('x25519_public.pem', 'ascii'),
     keyType: 'x25519' },
   { private: fixtures.readSync('test_x448_privkey.pem', 'ascii'),
     public: fixtures.readSync('test_x448_pubkey.pem', 'ascii'),

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-----BEGIN PRIVATE KEY-----`
	`2`	`+MC4CAQAwBQYDK2VuBCIEIJi/yFpueUawC1BkXyWM8ONIBGFjL7UZHrD/Zo/KPDpn`
	`3`	`+-----END PRIVATE KEY-----`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-----BEGIN PUBLIC KEY-----`
	`2`	`+MCowBQYDK2VuAyEAaSb8Q+RndwfNnPeOYGYPDUN3uhAPnMLzXyfi+mqfhig=`
	`3`	`+-----END PUBLIC KEY-----`