Skip to content

Commit

Permalink
test: move ed448 keypairs to fixtures/keys/
Browse files Browse the repository at this point in the history
PR-URL: #27962
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: Ujjwal Sharma <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
  • Loading branch information
reasonablytall authored and BridgeAR committed Jun 17, 2019
1 parent 9de9d55 commit 22bbdc5
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 12 deletions.
8 changes: 8 additions & 0 deletions test/fixtures/keys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ all: \
ed25519_public.pem \
x25519_private.pem \
x25519_public.pem \
ed448_private.pem \
ed448_public.pem \

#
# Create Certificate Authority: ca1
Expand Down Expand Up @@ -674,6 +676,12 @@ x25519_private.pem:
x25519_public.pem: x25519_private.pem
openssl pkey -in x25519_private.pem -pubout -out x25519_public.pem

ed448_private.pem:
openssl genpkey -algorithm ed448 -out ed448_private.pem

ed448_public.pem: ed448_private.pem
openssl pkey -in ed448_private.pem -pubout -out ed448_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
Expand Down
4 changes: 4 additions & 0 deletions test/fixtures/keys/ed448_private.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-----BEGIN PRIVATE KEY-----
MEcCAQAwBQYDK2VxBDsEOdOtCnu9bDdBqSHNNZ5xoDA5KdLBTUNPcKFaOADNX32s
dfpo52pCtPqfku/l3/OfUHsF43EfZsaaWA==
-----END PRIVATE KEY-----
4 changes: 4 additions & 0 deletions test/fixtures/keys/ed448_public.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-----BEGIN PUBLIC KEY-----
MEMwBQYDK2VxAzoAoX/ee5+jlcU53+BbGRsGIzly0V+SZtJ/oGXY0udf84q2hTW2
RdstLktvwpkVJOoNb7oDgc2V5ZUA
-----END PUBLIC KEY-----
4 changes: 0 additions & 4 deletions test/fixtures/test_ed448_privkey.pem

This file was deleted.

4 changes: 0 additions & 4 deletions test/fixtures/test_ed448_pubkey.pem

This file was deleted.

4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
{ 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'),
{ private: fixtures.readKey('ed448_private.pem', 'ascii'),
public: fixtures.readKey('ed448_public.pem', 'ascii'),
keyType: 'ed448' },
{ private: fixtures.readKey('x25519_private.pem', 'ascii'),
public: fixtures.readKey('x25519_public.pem', 'ascii'),
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-sign-verify.js
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ common.expectsError(
public: fixtures.readKey('ed25519_public.pem', 'ascii'),
algo: null,
sigLen: 64 },
{ private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),
public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'),
{ private: fixtures.readKey('ed448_private.pem', 'ascii'),
public: fixtures.readKey('ed448_public.pem', 'ascii'),
algo: null,
sigLen: 114 },
{ private: fixtures.readKey('rsa_private_2048.pem', 'ascii'),
Expand Down

0 comments on commit 22bbdc5

Please sign in to comment.