Added self tests for ECC PKCS #8 files.

5 files changed, 51 insertions, 1 deletions

diff --git a/tests/key-tests/Makefile.am b/tests/key-tests/Makefile.am
index 70ef058747..e388d3c7c4 100644
--- a/tests/key-tests/Makefile.am
+++ b/tests/key-tests/Makefile.am
@@ -21,7 +21,8 @@
 
 EXTRA_DIST = README key-ca.pem key-user.pem \
 	ca-gnutls-keyid.pem ca-no-keyid.pem ca-weird-keyid.pem \
-	key-ca-1234.p8 key-ca-empty.p8 key-ca-null.p8 
+	key-ca-1234.p8 key-ca-empty.p8 key-ca-null.p8 \
+	openssl-key-ecc.p8 key-ecc.p8 key-ecc.pem
 
 dist_check_SCRIPTS = key-id pkcs8
 
diff --git a/tests/key-tests/key-ecc.p8 b/tests/key-tests/key-ecc.p8
new file mode 100644
index 0000000000..189ab0144f
--- /dev/null
+++ b/tests/key-tests/key-ecc.p8
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIH3AgEAMBAGByqGSM49AgEGBSuBBAAjBIHfMIHcAgEBBEIB0Q4ImmR/QzaLTcoL
+uzq0vVA28hRlQKGLWq9g6yJgG7dCSWiCHFEiJTWjost5d/FeH32SsIUv/3b23sf6
+JObBbdmgBwYFK4EEACOhgYkDgYYABAFnPgQpDICaoXXeWB2Fh3QOiwm4BQSkZzC5
+JKwwbfTDIX+rS1TyZVjgZtt+twmmL+nOxMtpdsW+9OFmy2kVjy1a3gGIZjei/XsK
+d84XH/9pdIdyUaaaevaFL3Hnjgw+nsPK40Ii0j2b91oZ6+qnIV7hkA4g+pCL33h7
+AZtfTYAktAKdyw==
+-----END PRIVATE KEY-----
diff --git a/tests/key-tests/key-ecc.pem b/tests/key-tests/key-ecc.pem
new file mode 100644
index 0000000000..57e40c7e5b
--- /dev/null
+++ b/tests/key-tests/key-ecc.pem
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHcAgEBBEIB0Q4ImmR/QzaLTcoLuzq0vVA28hRlQKGLWq9g6yJgG7dCSWiCHFEi
+JTWjost5d/FeH32SsIUv/3b23sf6JObBbdmgBwYFK4EEACOhgYkDgYYABAFnPgQp
+DICaoXXeWB2Fh3QOiwm4BQSkZzC5JKwwbfTDIX+rS1TyZVjgZtt+twmmL+nOxMtp
+dsW+9OFmy2kVjy1a3gGIZjei/XsKd84XH/9pdIdyUaaaevaFL3Hnjgw+nsPK40Ii
+0j2b91oZ6+qnIV7hkA4g+pCL33h7AZtfTYAktAKdyw==
+-----END EC PRIVATE KEY-----
diff --git a/tests/key-tests/openssl-key-ecc.p8 b/tests/key-tests/openssl-key-ecc.p8
new file mode 100644
index 0000000000..4fc966f328
--- /dev/null
+++ b/tests/key-tests/openssl-key-ecc.p8
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBVy6SYAmhmSrS0E/0
+xhNiUAEFOz9dtEv0PTzP6H5aGBBBGOFi6304ubHZC95yWW/yXPPG9P81DLZFRePd
+JPNM3T+hgYkDgYYABAG3MNeg0jYQ0CNREIKTMo8v1AICBp25hpMK9UTFnUD6frEo
+jSfm1WR+ItaEDmP9pGOmIqOuSlBIIKGnMFj4Ye5MDACHdTwTV0K7uJ/Ls4j+yNKX
+8ATcC2dvM7+ihkHf/uZxP7N18bDVcfmJAJzZvu6/XiRI09XhXxd0fQ9RTh2IZeKz
+EQ==
+-----END PRIVATE KEY-----
diff --git a/tests/key-tests/pkcs8 b/tests/key-tests/pkcs8
index 05f82c797b..746bd98157 100755
--- a/tests/key-tests/pkcs8
+++ b/tests/key-tests/pkcs8
@@ -106,6 +106,32 @@ if test "$rc" != "0"; then
   exit $rc
 fi
 
+# Tests for PKCS #8 ECC keys
+
+$CERTTOOL -k --infile $srcdir/key-ecc.pem >/dev/null 2>&1
+rc=$?
+# We're done.
+if test "$rc" != "0"; then
+  echo "Error in reading saved ECC key"
+  exit $rc
+fi
+
+$CERTTOOL -k --pkcs8 --infile $srcdir/key-ecc.p8 >/dev/null 2>&1
+rc=$?
+# We're done.
+if test "$rc" != "0"; then
+  echo "Error in reading saved PKCS #8 ECC key"
+  exit $rc
+fi
+
+$CERTTOOL -k --pkcs8 --infile $srcdir/openssl-key-ecc.p8 >/dev/null 2>&1
+rc=$?
+# We're done.
+if test "$rc" != "0"; then
+  echo "Error in reading saved openssl PKCS #8 ECC key"
+  exit $rc
+fi
+
 rm -f tmp-key-ca.p8
 
 exit 0