diff --git a/lib/hx509/data/secp160r1TestCA.cert.pem b/lib/hx509/data/secp160r1TestCA.cert.pem
new file mode 100644
index 000000000..414a47cf1
--- /dev/null
+++ b/lib/hx509/data/secp160r1TestCA.cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBxzCCAYagAwIBAgIJAKoTUiERrw9eMAkGByqGSM49BAEwNjELMAkGA1UEBhMC
+U0UxEDAOBgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMTAeFw0w
+OTAyMDcwNzE5MTZaFw0yMDAxMjEwNzE5MTZaMDYxCzAJBgNVBAYTAlNFMRAwDgYD
+VQQKEwdIZWltZGFsMRUwEwYDVQQDEwxDQSBzZWNwMTYwcjEwPjAQBgcqhkjOPQIB
+BgUrgQQACAMqAARLUjOrXi9LCnZYfH3fSKSTYudziVvf2GX0F0rsLaZ96pJoojqr
+H+u3o4GYMIGVMB0GA1UdDgQWBBR1cC5tsJHjcHMmCTQsvQr0muLgnTBmBgNVHSME
+XzBdgBR1cC5tsJHjcHMmCTQsvQr0muLgnaE6pDgwNjELMAkGA1UEBhMCU0UxEDAO
+BgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMYIJAKoTUiERrw9e
+MAwGA1UdEwQFMAMBAf8wCQYHKoZIzj0EAQMwADAtAhRIWbhgrN9kRs1qvXQdkIyk
+c1h+DQIVAN1ZQY2OH+z4us1smQf7I593kIu8
+-----END CERTIFICATE-----
diff --git a/lib/hx509/data/secp160r1TestCA.key.pem b/lib/hx509/data/secp160r1TestCA.key.pem
new file mode 100644
index 000000000..47ac826cb
--- /dev/null
+++ b/lib/hx509/data/secp160r1TestCA.key.pem
@@ -0,0 +1,4 @@
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFKhuj+VKk1xPrUgHn9yjDlT5mLwzoAcGBSuBBAAIoSwDKgAES1Izq14v
+Swp2WHx930ikk2Lnc4lb39hl9BdK7C2mfeqSaKI6qx/rtw==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/secp160r1TestCA.pem b/lib/hx509/data/secp160r1TestCA.pem
new file mode 100644
index 000000000..56d33f858
--- /dev/null
+++ b/lib/hx509/data/secp160r1TestCA.pem
@@ -0,0 +1,18 @@
+issuer= /C=SE/O=Heimdal/CN=CA secp160r1
+subject= /C=SE/O=Heimdal/CN=CA secp160r1
+-----BEGIN CERTIFICATE-----
+MIIBxzCCAYagAwIBAgIJAKoTUiERrw9eMAkGByqGSM49BAEwNjELMAkGA1UEBhMC
+U0UxEDAOBgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMTAeFw0w
+OTAyMDcwNzE5MTZaFw0yMDAxMjEwNzE5MTZaMDYxCzAJBgNVBAYTAlNFMRAwDgYD
+VQQKEwdIZWltZGFsMRUwEwYDVQQDEwxDQSBzZWNwMTYwcjEwPjAQBgcqhkjOPQIB
+BgUrgQQACAMqAARLUjOrXi9LCnZYfH3fSKSTYudziVvf2GX0F0rsLaZ96pJoojqr
+H+u3o4GYMIGVMB0GA1UdDgQWBBR1cC5tsJHjcHMmCTQsvQr0muLgnTBmBgNVHSME
+XzBdgBR1cC5tsJHjcHMmCTQsvQr0muLgnaE6pDgwNjELMAkGA1UEBhMCU0UxEDAO
+BgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMYIJAKoTUiERrw9e
+MAwGA1UdEwQFMAMBAf8wCQYHKoZIzj0EAQMwADAtAhRIWbhgrN9kRs1qvXQdkIyk
+c1h+DQIVAN1ZQY2OH+z4us1smQf7I593kIu8
+-----END CERTIFICATE-----
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFKhuj+VKk1xPrUgHn9yjDlT5mLwzoAcGBSuBBAAIoSwDKgAES1Izq14v
+Swp2WHx930ikk2Lnc4lb39hl9BdK7C2mfeqSaKI6qx/rtw==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/secp160r2TestClient.cert.pem b/lib/hx509/data/secp160r2TestClient.cert.pem
new file mode 100644
index 000000000..243ddc653
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestClient.cert.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBnjCCAV0CCQDdV8zZJxN5QTAJBgcqhkjOPQQBMDYxCzAJBgNVBAYTAlNFMRAw
+DgYDVQQKEwdIZWltZGFsMRUwEwYDVQQDEwxDQSBzZWNwMTYwcjEwHhcNMDkwMjA3
+MDcxOTE2WhcNMjAwMTIxMDcxOTE2WjCBrDELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
+AkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MR8wHQYDVQQKExZTdW4gTWljcm9z
+eXN0ZW1zLCBJbmMuMSYwJAYDVQQLEx1TdW4gTWljcm9zeXN0ZW1zIExhYm9yYXRv
+cmllczEvMC0GA1UEAxMmVGVzdCBDbGllbnQgKEVsbGlwdGljIGN1cnZlIHNlY3Ax
+NjByMikwPjAQBgcqhkjOPQIBBgUrgQQAHgMqAAS1oDzuei8PIpwQIpUhZHeLtsC2
+5JRQHUeadFG1uX2p0igG6OGwGIfOMAkGByqGSM49BAEDMAAwLQIVAOCOZ0euLRa5
+EdxfktIjkzvcHys0AhRPyNYV0IY3ggvu5XTqT18V4Rde5A==
+-----END CERTIFICATE-----
diff --git a/lib/hx509/data/secp160r2TestClient.key.pem b/lib/hx509/data/secp160r2TestClient.key.pem
new file mode 100644
index 000000000..1c258d5e2
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestClient.key.pem
@@ -0,0 +1,4 @@
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFPOtjIMmIvKlwiBCxwZkZTLqldbSoAcGBSuBBAAeoSwDKgAEtaA87nov
+DyKcECKVIWR3i7bAtuSUUB1HmnRRtbl9qdIoBujhsBiHzg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/secp160r2TestClient.pem b/lib/hx509/data/secp160r2TestClient.pem
new file mode 100644
index 000000000..224e766bf
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestClient.pem
@@ -0,0 +1,17 @@
+issuer= /C=SE/O=Heimdal/CN=CA secp160r1
+subject= /C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Client (Elliptic curve secp160r2)
+-----BEGIN CERTIFICATE-----
+MIIBnjCCAV0CCQDdV8zZJxN5QTAJBgcqhkjOPQQBMDYxCzAJBgNVBAYTAlNFMRAw
+DgYDVQQKEwdIZWltZGFsMRUwEwYDVQQDEwxDQSBzZWNwMTYwcjEwHhcNMDkwMjA3
+MDcxOTE2WhcNMjAwMTIxMDcxOTE2WjCBrDELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
+AkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MR8wHQYDVQQKExZTdW4gTWljcm9z
+eXN0ZW1zLCBJbmMuMSYwJAYDVQQLEx1TdW4gTWljcm9zeXN0ZW1zIExhYm9yYXRv
+cmllczEvMC0GA1UEAxMmVGVzdCBDbGllbnQgKEVsbGlwdGljIGN1cnZlIHNlY3Ax
+NjByMikwPjAQBgcqhkjOPQIBBgUrgQQAHgMqAAS1oDzuei8PIpwQIpUhZHeLtsC2
+5JRQHUeadFG1uX2p0igG6OGwGIfOMAkGByqGSM49BAEDMAAwLQIVAOCOZ0euLRa5
+EdxfktIjkzvcHys0AhRPyNYV0IY3ggvu5XTqT18V4Rde5A==
+-----END CERTIFICATE-----
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFPOtjIMmIvKlwiBCxwZkZTLqldbSoAcGBSuBBAAeoSwDKgAEtaA87nov
+DyKcECKVIWR3i7bAtuSUUB1HmnRRtbl9qdIoBujhsBiHzg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/secp160r2TestServer.cert.pem b/lib/hx509/data/secp160r2TestServer.cert.pem
new file mode 100644
index 000000000..263d6596a
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestServer.cert.pem
@@ -0,0 +1,9 @@
+-----BEGIN CERTIFICATE-----
+MIIBITCB4AIJAN1XzNknE3lAMAkGByqGSM49BAEwNjELMAkGA1UEBhMCU0UxEDAO
+BgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMTAeFw0wOTAyMDcw
+NzE5MTZaFw0yMDAxMjEwNzE5MTZaMDAxCzAJBgNVBAYTAlNFMRAwDgYDVQQKEwdI
+ZWltZGFsMQ8wDQYDVQQDEwZTZXJ2ZXIwPjAQBgcqhkjOPQIBBgUrgQQAHgMqAASu
+DMnMPT5laPFQ40wkWlnVMdqJa4aH6MlYlKyvm4yrbMVu4PPs/u+cMAkGByqGSM49
+BAEDMQAwLgIVAJy669X5f9jVfdO30XF8qQcLuUSVAhUA1DXhcZkdPNQ6miMJKhAr
+rw4I6l4=
+-----END CERTIFICATE-----
diff --git a/lib/hx509/data/secp160r2TestServer.key.pem b/lib/hx509/data/secp160r2TestServer.key.pem
new file mode 100644
index 000000000..81c3d54db
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestServer.key.pem
@@ -0,0 +1,4 @@
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFNL70/+e7QJS5r7ok2Sn97/utO/zoAcGBSuBBAAeoSwDKgAErgzJzD0+
+ZWjxUONMJFpZ1THaiWuGh+jJWJSsr5uMq2zFbuDz7P7vnA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/hx509/data/secp160r2TestServer.pem b/lib/hx509/data/secp160r2TestServer.pem
new file mode 100644
index 000000000..8a7348249
--- /dev/null
+++ b/lib/hx509/data/secp160r2TestServer.pem
@@ -0,0 +1,15 @@
+issuer= /C=SE/O=Heimdal/CN=CA secp160r1
+subject= /C=SE/O=Heimdal/CN=Server
+-----BEGIN CERTIFICATE-----
+MIIBITCB4AIJAN1XzNknE3lAMAkGByqGSM49BAEwNjELMAkGA1UEBhMCU0UxEDAO
+BgNVBAoTB0hlaW1kYWwxFTATBgNVBAMTDENBIHNlY3AxNjByMTAeFw0wOTAyMDcw
+NzE5MTZaFw0yMDAxMjEwNzE5MTZaMDAxCzAJBgNVBAYTAlNFMRAwDgYDVQQKEwdI
+ZWltZGFsMQ8wDQYDVQQDEwZTZXJ2ZXIwPjAQBgcqhkjOPQIBBgUrgQQAHgMqAASu
+DMnMPT5laPFQ40wkWlnVMdqJa4aH6MlYlKyvm4yrbMVu4PPs/u+cMAkGByqGSM49
+BAEDMQAwLgIVAJy669X5f9jVfdO30XF8qQcLuUSVAhUA1DXhcZkdPNQ6miMJKhAr
+rw4I6l4=
+-----END CERTIFICATE-----
+-----BEGIN EC PRIVATE KEY-----
+MFACAQEEFNL70/+e7QJS5r7ok2Sn97/utO/zoAcGBSuBBAAeoSwDKgAErgzJzD0+
+ZWjxUONMJFpZ1THaiWuGh+jJWJSsr5uMq2zFbuDz7P7vnA==
+-----END EC PRIVATE KEY-----