File 0005-tests-Add-function-to-initialize-PKI.patch of Package basicstation

From 40357b75365e00c4de76d633585bd8738c7d519c Mon Sep 17 00:00:00 2001
From: Frank Kunz <mailinglists@kunz-im-inter.net>
Date: Fri, 8 Nov 2024 21:39:53 +0100
Subject: [PATCH 5/6] tests: Add function to initialize PKI

Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net>
---
 regr-tests/makefile                   |  3 +
 regr-tests/pki-data/cups-0.ca         | 36 +++--------
 regr-tests/pki-data/cups-0.crt        | 35 ++++-------
 regr-tests/pki-data/cups-0.key        | 32 ++--------
 regr-tests/pki-data/cups-router-1.ca  | 36 +++--------
 regr-tests/pki-data/cups-router-1.crt | 31 +++-------
 regr-tests/pki-data/cups-router-1.key | 32 ++--------
 regr-tests/pki-data/cups-router-2.ca  | 36 +++--------
 regr-tests/pki-data/cups-router-2.crt | 31 +++-------
 regr-tests/pki-data/cups-router-2.key | 32 ++--------
 regr-tests/pki-data/infos-0.ca        | 36 +++--------
 regr-tests/pki-data/infos-0.crt       | 35 ++++-------
 regr-tests/pki-data/infos-0.key       | 32 ++--------
 regr-tests/pki-data/muxs-0.ca         | 36 +++--------
 regr-tests/pki-data/muxs-0.crt        | 35 ++++-------
 regr-tests/pki-data/muxs-0.key        | 32 ++--------
 regr-tests/pki-data/tc-router-1.ca    | 36 +++--------
 regr-tests/pki-data/tc-router-1.crt   | 31 +++-------
 regr-tests/pki-data/tc-router-1.key   | 32 ++--------
 regr-tests/pki-data/tc-router-2.ca    | 36 +++--------
 regr-tests/pki-data/tc-router-2.crt   | 31 +++-------
 regr-tests/pki-data/tc-router-2.key   | 32 ++--------
 regr-tests/prep-pki.sh                | 88 +++++++++++++++++++++++++++
 23 files changed, 261 insertions(+), 535 deletions(-)
 create mode 100755 regr-tests/prep-pki.sh

diff --git a/regr-tests/makefile b/regr-tests/makefile
index 206f78e..f589315 100644
--- a/regr-tests/makefile
+++ b/regr-tests/makefile
@@ -54,6 +54,9 @@ s2core.info: ${INFOS}
 #	lcov -l temp.2.info | grep -P 'Total:.\s+100%\s+\d+.\s+100%\s+'
 	mv temp1.info $@
 
+prep:
+	./prep-pki.sh pki-data
+
 clean:
 	rm -rf s2core-html s2core.info
 	for m in $$(find test* -name makefile); do \
diff --git a/regr-tests/pki-data/cups-0.ca b/regr-tests/pki-data/cups-0.ca
index abc84a5..820dd6d 100644
--- a/regr-tests/pki-data/cups-0.ca
+++ b/regr-tests/pki-data/cups-0.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIBgzCCASgCAQEwCgYIKoZIzj0EAwIwTTEQMA4GA1UECwwHRXhhbXBsZTEVMBMG
+A1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEVMBMGA1UEAwwMQ1VQUyBS
+b290IENBMB4XDTI0MTEwODIxMTM1MVoXDTI1MTEwODIxMTM1MVowTTEQMA4GA1UE
+CwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEV
+MBMGA1UEAwwMQ1VQUyBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+Z4eX3QkZvbiSM1L0ReSS2vlaaOkTuJ8WSdWBom3SAAvQg/UD28mRYHc2Y1wwSngt
+qVj+QLfKm0ki27IccqAKFjAKBggqhkjOPQQDAgNJADBGAiEAu2KVCVdB4xolzw4W
+7l9qlO4ErmT/cXlq4RrlpGMOUm0CIQClwW0Y/AnIBDXGzX2tTF52TqksFSjIPPm7
+e8psifTmlg==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-0.crt b/regr-tests/pki-data/cups-0.crt
index 386498c..14b77db 100644
--- a/regr-tests/pki-data/cups-0.crt
+++ b/regr-tests/pki-data/cups-0.crt
@@ -1,25 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIEIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQwWhcNMjIwNTIyMjA0ODQwWjBIMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-ETAPBgNVBAMMCGN1cHMtOjowMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwGjk9WYmvJRhW3mk8nNDEc8qRGh3zCUVt/3Tpgx4p2PPskayZNQCNDCuO6xy
-a890cyppmxxeKflxazxB9qXODeli/++39TJL3p7CtIVdiECoKsQiQBFfLbLitoiI
-hG9wv4tFaT5IE2A3hewBeRWc4/egUvPDvz9SsO/+fAILcQTA0cjW6uPe+Frvmegr
-5a3BKXOMhqvap2xqN3Gxf1IW1b7tvjP7LoezxnakepvUC6MxZgWQ3pkhLd0La78N
-LKx0e76J4C2NjXaZbGtgLO7/v7EllRSfJ5Z8bbfpJk9BjK0MAQLyPTUtn/QMvoNV
-et53UhxUF1mBqmdK7Y1tNEflEwIDAQABoxgwFjAUBgNVHREEDTALgglsb2NhbGhv
-c3QwDQYJKoZIhvcNAQELBQADggIBAH9255J407pOHfCbxB61YhLEwErZvgADOltb
-S1H5K842uUcQbS+0lYODnEJJR71uoLNjoelFMowfxdhqpskzL4fLGLG2qG1pF37v
-E4u/sUIoeDTHeoKl/T4ksYyxGKdpWupzSLF9exUbCMmLNTQPjti3hbt3syZ4iDJx
-7K4xIOPbyKZsA1YajTn1IGjSPTrnrlwvPlQg5bsPR858NpksT+nfb/KPZvMV60iI
-VSGzGbdX1hqkbtIihqp+VhOoHPhLK3ay7hkoR0GzX8pdQ45tGHgJRUFpn8bHGm9W
-nlfmI6JSwGkKUN+8ZCZBm8luG5M8WlqvfhkN1HBXTAtAL5HVZsG5Qb8nAkF8lGjv
-kZQBMJTtgPvkgTm5eH3uOS4v+Bdml0pTeiG38VTJgY/SjJvbzTG/z9Twd01uXnTt
-Xi7d8yhe3wXlnwqg4T6AyJIms9V/awn4+hCaV8u6frZlNYKVbRjYlfBsmSRUilNm
-c77HzKLhhUCq+wq2pSqQhwOh2OTtlHYAg/oW1m+gj4KagNH7OWwjFCXDxb7+Evqt
-F0YIw0lKN2ag6rDHCWfUsSJL6WCOAuH6yYYdiTb/ercucxNSzrPP2EVMbpnZK6eU
-fS4badasOAtX5gyET5SzR+xSDBaLQznZx6qh0w3ycm7b/65tEgpnA6RsfExY0/Mc
-RVvBNr0Q
+MIICHjCCAcOgAwIBAgIBATAKBggqhkjOPQQDAjBNMRAwDgYDVQQLDAdFeGFtcGxl
+MRUwEwYDVQQKDAxCYXNpY1N0YXRpb24xCzAJBgNVBAYTAkNIMRUwEwYDVQQDDAxD
+VVBTIFJvb3QgQ0EwHhcNMjQxMTA4MjExMzUxWhcNMjUxMTA4MjExMzUxWjBHMRAw
+DgYDVQQLDAdFeGFtcGxlMRUwEwYDVQQKDAxCYXNpY1N0YXRpb24xCzAJBgNVBAYT
+AkNIMQ8wDQYDVQQDDAZjdXBzLTAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARW
+KgCiHiNOhhP3N4r8Yl2ax3yoDgm0IgAvfI49nXMhCahRCRb5E0qmbzaP85VqbyX+
+bS1k2HS8hTi0MomqYodao4GZMIGWMBQGA1UdEQQNMAuCCWxvY2FsaG9zdDAdBgNV
+HQ4EFgQUvcxp3re6ZZ3V4oUaEf27bEMrkfwwXwYDVR0jBFgwVqFRpE8wTTEQMA4G
+A1UECwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJD
+SDEVMBMGA1UEAwwMQ1VQUyBSb290IENBggEBMAoGCCqGSM49BAMCA0kAMEYCIQDB
+zyAzJeHVgpjYngbsCQ7Xj4fUsQO9XmUktiSUz323TgIhANsEBhEkqAdGhq7BGPAK
+qJQbDPvMaeaaA6SdMHNBicKh
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-0.key b/regr-tests/pki-data/cups-0.key
index 66dbba4..8f0c372 100644
--- a/regr-tests/pki-data/cups-0.key
+++ b/regr-tests/pki-data/cups-0.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwGjk9WYmvJRhW3mk8nNDEc8qRGh3zCUVt/3Tpgx4p2PPskay
-ZNQCNDCuO6xya890cyppmxxeKflxazxB9qXODeli/++39TJL3p7CtIVdiECoKsQi
-QBFfLbLitoiIhG9wv4tFaT5IE2A3hewBeRWc4/egUvPDvz9SsO/+fAILcQTA0cjW
-6uPe+Frvmegr5a3BKXOMhqvap2xqN3Gxf1IW1b7tvjP7LoezxnakepvUC6MxZgWQ
-3pkhLd0La78NLKx0e76J4C2NjXaZbGtgLO7/v7EllRSfJ5Z8bbfpJk9BjK0MAQLy
-PTUtn/QMvoNVet53UhxUF1mBqmdK7Y1tNEflEwIDAQABAoIBAH2G8Xi4ACWfmDSZ
-k+cpE2SXBzhB/4YL27OBwYbfNAfgsivYu6HUPuvVppX/11ZGre5EiUlMpJI1zqzr
-Tw2e9mNVE+Vte1JYUe8XHGexamft5sif1Mh/jNy/i/ER+h6Mpb4RGmOi4lrhtteE
-NSHN2+FOOCZmKhqnMUeGCzzUCKreD6ysX1mir2dlfFeGilruQxXokS6XBAPJYW7J
-C1BL+DzIGk/GAfCRr6EApgGCRcxXnE4aT//EzBqch+MzN55LZqe09T4IihVw6epL
-7HcyzhHVDjdgi6E4BYEFyu7YS+7UpWbpZmx5E/QnrZlLqaOGaj/fUJspvwuSLH0w
-Ld8IQ8ECgYEA940yVDajXT4fRy723Y/8bPSsEHmIo1aWoWz+/09VUvEaKo919pPx
-bjid4suUVl5BB6XW1biiTulGD4OHO0ZFXHCIGoZ7lt2/rVRgoW3YpqSN2S8wgkSa
-aCORfKV5fnWRXiw8jLkehLM7qGqRNp5LYE2Xux3WNmYeSMjAuT84EgsCgYEAxvnv
-mpgTI7Y6Y94BICaOQRfZknkyuFEdOC47dIIwA8NNqYh03WgOF3VeSG/Gqa5z5/NA
-fT/ZY0OOXv1AWme2vtX/lYhQm1Rsd0uSMF6rZ4UfCPoBHz9D+/+M7fLLBBJKbYEm
-NkBu43mGEBEFt8lLa9u41E68fzrjuV0sb6gxphkCgYEAiRTMMOwMrL6QzXdJRsnL
-633Vpk3WhzSUtxFHZ5PD2OkgJz9IAGJOSE3byFIZc3ZAJn8EJ1dVscLlhAO+p+ky
-0YyTIbUkzRdAZDgcRmgwl5752bGS+CALLO29S7vKOmfaNr7iTL7aEnu55noUrZ0c
-elidVAWisH79+CoK5soGP58CgYBkZcBMVOdzYYNc2KvguROWLJ6Pla/N6L/BlTJS
-u03W2DjbjgrJnLNfis0j56JqA6hgJREpIYpi17eCnm5WL3a6G+h2Xu2tMo/4MZ11
-4o7CER1zvhHK3nVDNdK6TYO6bjA3yK6rOR+6j5rhiHVGIr93kMpV9dSOrfwxj53Y
-SRmkIQKBgQCf0MEWvI1CtzqRGy4sDGQBiKHGlJeguuV17ZhjaWyNVZRQXFIe+0Fc
-OUV0pigzpNYwHYbZNf01rkl9V34jcXlDnzN/8i42ySgjzjgMewBj18+Oy41Qp/lD
-m0dUrTDTvj8FbBmVDbpYcxrrOXsxPMLETQkMUxT7+wA9fEbh60xSYQ==
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHuK1F/KL0oqd6PLQCvBEzlUlhZHW+edJjKvFVsXgTydoAoGCCqGSM49
+AwEHoUQDQgAEVioAoh4jToYT9zeK/GJdmsd8qA4JtCIAL3yOPZ1zIQmoUQkW+RNK
+pm82j/OVam8l/m0tZNh0vIU4tDKJqmKHWg==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/cups-router-1.ca b/regr-tests/pki-data/cups-router-1.ca
index 5bcc1d7..820dd6d 100644
--- a/regr-tests/pki-data/cups-router-1.ca
+++ b/regr-tests/pki-data/cups-router-1.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+e8psifTmlg==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-router-1.crt b/regr-tests/pki-data/cups-router-1.crt
index 7cd60d9..73a4cd4 100644
--- a/regr-tests/pki-data/cups-router-1.crt
+++ b/regr-tests/pki-data/cups-router-1.crt
@@ -1,24 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIECjCCAfKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQwWhcNMjIwNTIyMjA0ODQwWjBKMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-EzARBgNVBAMMCnJvdXRlci06OjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDEPCHeQckoP7YjEJBWk+qKjgsDed33TlqqBc9GzPNn4hvNetZ57bOKi25S
-KRB9tfdyXGEZREFmKdoENp2iYDWwCOxj9KnZYJLeUS+DZFF1/whjKJlr4MM/V7/Y
-pnTBIqHKgdTN8727v1N4uUlWhW1cncEXaWFlsl7s7XRDGUPdO0JzNR8DL0p4jBOO
-QlaO5RGH/+MaHrAIo5eQ+oBHRuHcFRNH4iDTxnlpDTp1uI2c6vh6PQ7VnnEoYHFR
-bMF11CTpluaiEYCt/SzwVjOwT+mz74HCSk8jwI8J86rjdStXgezG1wTWmSKnsgcC
-Y7MNYBKLeaZg3UlsTo2HftKo/CKxAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAFPH
-3c42YjjhhEBzrBXBGN/4s8zjzuendBJxNPvCC/XqmKGmqtSL464JSppoKdgNvPG8
-0/0vmbPg/9/UNLDRdZPwvdgRxz7YMl0YoglWbI0+m5vGKfzKL/4T5YsQAghjixp0
-zrbM072TlJLSJzGbLwuvTAdQjfNnxFLslaOVrBlx83cKpF74PmMQBy8l3EyHf70r
-hwJflppib0cRjY7UYLCZb6LssCFO7BIjfsLrlQox4OrUZKfnZMmHBiBVAbijbFQk
-cnZ2bh4nWJsUgWF7P2+c39LOWQv34hp0EBqBVzfIsrjbgxWzLu8ZIEXGEPOgcFsp
-KEu1DraMxzVm3OHxDmDMO1l1sLV2Ilo2BXs/GfqvxhrwcuJLesf7orkEhZEjd2R2
-ofsdT3dbWZTZrXmWDP9jbdIhSh2mHEoAJppe5GWTS9SkKNx5Ne7nNPGQGVeru8y+
-FW7NJDiOqdH4UttWYE+GWPE7hDNq9bz27gR4WtHwZ3MhRjZD0ricUoNVxkXoFI2p
-oZi8M5bt0e1+qNACGvLBd3NfS9D7Uk0mkcKZEgxtA1iERxzl7knwi2hMj1GMv4p8
-FTjBXtaDmizDufQm9x/rLtsG8mtg7auhvUSkhW3rFbO/5OGWxZKqMDX40+ZTzE1F
-9dDslePP+W83PV8MdjVy+bcC9R6KL0B4RbT+Egqh
+MIIBgzCCASkCAQEwCgYIKoZIzj0EAwIwTTEQMA4GA1UECwwHRXhhbXBsZTEVMBMG
+A1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEVMBMGA1UEAwwMQ1VQUyBS
+b290IENBMB4XDTI0MTEwODIxMTM1MVoXDTI1MTEwODIxMTM1MVowTjEQMA4GA1UE
+CwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEW
+MBQGA1UEAwwNY3Vwcy1yb3V0ZXItMTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BIGlgOoNMSwj+SAoYdiqbh8i2bok/ZxUVWLWOlgw8R0MiBNmafXnhh7ZjC96+HcQ
+RzMqzYxmzPxLz/eSC77uUvgwCgYIKoZIzj0EAwIDSAAwRQIhAJ7GvNNYtAXuXgqe
+Ze+18ztvundHsJYuRjxzmUDRi+xIAiAy0AWWB+jBFtcQdo4AyFHandLWFP/Z5Il5
+lGidysUQqg==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-router-1.key b/regr-tests/pki-data/cups-router-1.key
index b5df21a..8d8d936 100644
--- a/regr-tests/pki-data/cups-router-1.key
+++ b/regr-tests/pki-data/cups-router-1.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxDwh3kHJKD+2IxCQVpPqio4LA3nd905aqgXPRszzZ+IbzXrW
-ee2ziotuUikQfbX3clxhGURBZinaBDadomA1sAjsY/Sp2WCS3lEvg2RRdf8IYyiZ
-a+DDP1e/2KZ0wSKhyoHUzfO9u79TeLlJVoVtXJ3BF2lhZbJe7O10QxlD3TtCczUf
-Ay9KeIwTjkJWjuURh//jGh6wCKOXkPqAR0bh3BUTR+Ig08Z5aQ06dbiNnOr4ej0O
-1Z5xKGBxUWzBddQk6ZbmohGArf0s8FYzsE/ps++BwkpPI8CPCfOq43UrV4HsxtcE
-1pkip7IHAmOzDWASi3mmYN1JbE6Nh37SqPwisQIDAQABAoIBAGeg3b3Sfdk8dAHm
-cGLYMCbFRjmqtLYx8Z0R/lkESJIWjNohQXwYNBU49qR6vRO18Zu5/yjpq6O4/EH3
-WZ1zM0boH3XVsZBy+Hxg4TeA1af7a0F6IjMe+dzMiSpvFP8dO9WGZIvyaMLqEbmS
-F5GSWqNrR5oGc4HSBWEXMKtyfy0nffE/FTCJCVK2xFr2nIH9poAqxrVx0fj/4sGu
-rRoEdIKvBbRzu78o+salKlPEKa7NXbc2OwBj3sA06JKdKvdnuLhIeu/GbH/2uuLS
-eizadUlya9Bvb2MhuUT52vDfbucSpLtCG6ByH0XKqDoJ065Al9sAoMUSOrU4UKPW
-5fBsJEECgYEA8BwsMI4nkjxf1lPf9y1ZaQVZLL5pD/r+SPRHoysm0VzG6COYPMct
-Gvzy/9ZPyP8FXvhxoLUV9PqFMHd0fdbNQdpD3/DR+62v9byaepMz5pvEyWuXTikZ
-jMGtozOlszE6SAMLmXO4CYMhXTfrZhtpYR/QWGKFEdE2RxEdoOQG3dkCgYEA0Til
-7YkNTElHjE9+zYgRSZCZihI9RjRJzTTIlw5PozTuyi3uVIy86z1+sbTKRVpgnxKW
-+h++HJh2oJQZs4otYxIn5oVyw2vBRkAv4H/27ieITdEScLDLFo87NX2RWgaJH2Jg
-3DypSHvXhKkd56ayrXVzh96Hy7u1KjosEkVabJkCgYEAtrXZcoFZ30+N5fwhO2gI
-13+4YfHq5Lwr77vjH2jguwQMX+1mFSnDSvwctU2RnPNiVOhdHtttf+N6omzj+jYQ
-LwI2EByizQ9YDHieXJPTNLJnxpXWpyVjSda/mKbeekMFhHK8yuJhsutT4imBOUu2
-nq+kzPz7IZm/4chGcX3TM9ECgYBa2yrTWGz57+iuOedrAeff9nd2yizpy9Mw1fc2
-AfT7fwUjr4aMGQIBdhcKvOQJ8hF7gusle5tnd54sZaQzn5HOMBg7tz/7NVQdWcpw
-x6FIEsrSYDSN03ieN10TAZCZc7Ugd+xwN7ebzovtBDQEYRO+1/5vxmdaRg2KZPC2
-jn+SIQKBgQDNKHyX+IpPiA1wjC0yDLfhBYVjKEMV8O7B2Zd6ZX45T1lQKMSSYqxn
-VxB+pB8AgtwPSxV4MV8zzyvM1gysvaG9YR2q1RNGmSLa08L8fqtAeOyRMphT2QqB
-35ApbhA3zDceCcbtDjcf2bt+vpIwQb1QWMaqIiJIqtSIvvBrcv5EqA==
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJO05XAC/CyM1K8ubrWYQK3YSPWyzP7qS3rWt3y6volkoAoGCCqGSM49
+AwEHoUQDQgAEgaWA6g0xLCP5IChh2KpuHyLZuiT9nFRVYtY6WDDxHQyIE2Zp9eeG
+HtmML3r4dxBHMyrNjGbM/EvP95ILvu5S+A==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/cups-router-2.ca b/regr-tests/pki-data/cups-router-2.ca
index 5bcc1d7..820dd6d 100644
--- a/regr-tests/pki-data/cups-router-2.ca
+++ b/regr-tests/pki-data/cups-router-2.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIFAjCCAuoCAQEwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UEBhMCVVMxEDAOBgNV
-BAsMB1NlbXRlY2gxFDASBgNVBAoMC3NlbXRlY2guY29tMRAwDgYDVQQDDAdSb290
-IENBMB4XDTIwMDUyMjIwNDg0MFoXDTIyMDUyMjIwNDg0MFowRzELMAkGA1UEBhMC
-VVMxEDAOBgNVBAsMB1NlbXRlY2gxFDASBgNVBAoMC3NlbXRlY2guY29tMRAwDgYD
-VQQDDAdSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2biQ
-IKlJuVjq8s5eYXFNUXkMo1lQkeeI91JJ6nMOhjkF8f1MTuijoVULUBxRSN8Zx8yg
-BYD84DYn4NwyQuoVa0bMlPBjRKCBdvXTDDqvO1Qa8UL+awhTcM7U4Ki03BhQrB3c
-sf6QMN9FTvcP7VCDilUXEmdgM5EasF2xCRJWQvOeKPylCojUYlYaENhUYjEtTR4M
-ln7omr6dA3gmmbfMix2RTmv8CP2m0gYKOmH9hzo5S4fmeo2L9bdStrDJdHjSNykc
-iJxTBsO5Q+rx8cFCXugH0G0cIDJXFXEd/TG3YqOjNXAwv6EaTJC6B0GA83PZUxyE
-XUFTQEoHIlvArdH1IJKqguI69gUrkmbE5WQtKpLEZxeGP2QgWH6DzrvG/xTSc21V
-DkHhVB9oL8NdNsDPXvHlhSdX8SPn+95MCeqsS6TmpVdllsqc0x5mx9CXGEZ7vsjl
-Hzla/5TP7lKOQWV7WpZ6z2e6EeO6nVlB/IdBxFzuppWzTVeddjbo1qOJ8Jip/rgz
-DE1adb2jLLY2wnXD2aPLcRp5O25va6TV110YJpPZuraQr8mt0G99G+LzAhV1pk2M
-u+YVuxt4vcauITGHnyEpVCywEUyoOoyA2qnzsP6UtgBFDHMFGbBfqjtYk9TpVMwV
-CeisO2j4aMvf7kx0/lKe69ssj+3ckGNlDsGQHdcCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAgEAVXyYan79ptRfoRBN6thLgU+LYjzyt0Z7xZDRRZgUCYd21j+IEyRuqhjh
-g6w/bmgJ85M3/GbcTinjOxCFV0d0+yo5/2kQ/0TySiToAWgGhQbTOaCY13oTAlMI
-W1ZHOmnsCbdTA0QNB1REpyEu/WY7Gq5Uzhk/k0LpCPW735wwbPEuZqxaCmkrBlMp
-ubtPWIV3Br8IrpjglB0kM62TPcVxYCV1f7uyWviUYKxNrWXr8Rh+EorlZRZ9tQQG
-ZVnrrfbUCSwnHZ4Axx/7V86EXT642Mu9dFKZSVG44cHIqp9VRoqDub4E6P6+p4ml
-RiaN8hjz7NDtXV6+Cxtqm7Zh1s25T31WFTCd4VJadqV7NneLOUOLdV0qgaaxK7Um
-B9JgcQimV69YmZ00qYyd+rQzzkfhZhLKS55X7yIwvnuuOSABqMzE7xAEXqPmNv2c
-TuYT6voCoS5gVauKKmn3pddQERy94QpDc8HmWfkQDmopG6hTFJ0pC0WPmwn2NXaz
-/FA5PHD5i9w5mz+Bxpr3xFvnAFJEux+ZxY4URJZypSnUMvlUGcn1bxJwY6hMGbeP
-XckEqnCU2+IrxI2IUGwL/H9L3bQp4fGw7LTTcImDtEv1/8uplK+K007zG3lbiPKt
-JRRBYORcbZfQRkuYphJkf9W4t20XL6++v7OVRahu6vNx9TqGw6I=
+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
+e8psifTmlg==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-router-2.crt b/regr-tests/pki-data/cups-router-2.crt
index 94dfcca..00ea792 100644
--- a/regr-tests/pki-data/cups-router-2.crt
+++ b/regr-tests/pki-data/cups-router-2.crt
@@ -1,24 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIECjCCAfKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQwWhcNMjIwNTIyMjA0ODQwWjBKMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-EzARBgNVBAMMCnJvdXRlci06OjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDwyTrvZAnfyXEA3HP+V54UJ3AtWcJF8uwONHfxPDmMwdz2eeRG5jwgC92R
-f7OHUM66eHUfXEzoZ3w1HnMEu+mQT9LJ5cb0aGkryRDr4J6KiGp58hO4SYCgVLpk
-DOnTq3OdAlow4KRDhxC2p5jt0SMUtzZ6jIv5l57HTmFNRoJaP5fR5B4ofiSHXXpo
-nbIgm9rWAkEAPj5b0Pf3mPhlXMqzeIDDKBP5eG6VE6C9t9XdyAcq4yuiwrp2654A
-JP6utgiMzU+U3jxzxXPklJlYPVFjWhTgAfTC3Q8YSuvKEKFtPHKTYh+BAKr/jnPD
-6tbyysxjkbg0fY7GIh9lRq5CAN+vAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAK5G
-HBejXZ0kK9k5Os9cSAhpIrXVXk5wc8EYZxSy3Ohm1R/Q5jWOX+iFUT+njQ2e2l4e
-5gFj5NSwyTQC9gnLGIWEQ2ZjVvCTvXYKRSWspMTi+9/0J6VFZwGNe8WQBWiczyFL
-s4001ns0Ok1azd64S53pUPHmR/LIayEisxYwtQGdTUl5HvRrwTy5KtVMoz1AzjYw
-fqaUcb3PnJpraCX4ERV5SapdSzLzjtC7OahYwGcWmcsEGa28JuGlEo5O4vZmpHD6
-MWxjzuoIwQBKN9DQ5Er4MHu1uxo+HpqP7C1O1HTi15abJ1FQ6awV6XIrxLXbJJ9M
-liFUu3oupMB7sZMKfgEzeruFkoVdDvjOmnvwg4NP03NQK9BeGKbA19N0/j5l+3Ar
-V7Rpt1PjvalpthQTayBh0aWZV0nLSgyPNar9k6Pn7r2yyaF2vN3Wi1ug0Mv5QlMD
-AfFKJ1IAHFEjZJmyKHXH7JhMhI9/0h/bnSxY8yC7Hf/hPm4iU/3zEIMA8Xcfft/6
-VsQMK1dtJNdBVHVOtQJt+NcNscXzMCDRg9gDluwseP1djIEUgbxyp/Pwkr1ftuFp
-9KgRQ1qpoJLWu5kn8zFR1dWGSLxHx7kXDx/hVZL3BIRP3D47M4gVRsh7Lq2GtrhY
-T/fzGIge3Sj9NId0fWcaG07MR5OfpilS9GTO9EQO
+MIIBgzCCASkCAQEwCgYIKoZIzj0EAwIwTTEQMA4GA1UECwwHRXhhbXBsZTEVMBMG
+A1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEVMBMGA1UEAwwMQ1VQUyBS
+b290IENBMB4XDTI0MTEwODIxMTM1MVoXDTI1MTEwODIxMTM1MVowTjEQMA4GA1UE
+CwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDEW
+MBQGA1UEAwwNY3Vwcy1yb3V0ZXItMjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BOlDK7H+alxdfW7Vpmcx59u/A68jaf56vA6mscVJoTwOtsAZCJpv0xAOEb0tx4T2
+YxqcHuSxFZoeCfPuqSZRdi8wCgYIKoZIzj0EAwIDSAAwRQIhANbzD7XYjMYPEIZo
+24BNUrijNUC5g8WVGMv40q7yg8bGAiBUeUybJoGLKu1sWNLsOFYTUPfl4Ym5oZ+E
+aO8dRtpadw==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/cups-router-2.key b/regr-tests/pki-data/cups-router-2.key
index dd165cd..18f6dda 100644
--- a/regr-tests/pki-data/cups-router-2.key
+++ b/regr-tests/pki-data/cups-router-2.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA8Mk672QJ38lxANxz/leeFCdwLVnCRfLsDjR38Tw5jMHc9nnk
-RuY8IAvdkX+zh1DOunh1H1xM6Gd8NR5zBLvpkE/SyeXG9GhpK8kQ6+CeiohqefIT
-uEmAoFS6ZAzp06tznQJaMOCkQ4cQtqeY7dEjFLc2eoyL+Zeex05hTUaCWj+X0eQe
-KH4kh116aJ2yIJva1gJBAD4+W9D395j4ZVzKs3iAwygT+XhulROgvbfV3cgHKuMr
-osK6duueACT+rrYIjM1PlN48c8Vz5JSZWD1RY1oU4AH0wt0PGErryhChbTxyk2If
-gQCq/45zw+rW8srMY5G4NH2OxiIfZUauQgDfrwIDAQABAoIBAQDDKlgasXtPaHev
-uwBJp7r5mv3RxG8zQzMSUHTnk2kSLhBrt2DQFs2lK/jrdhaOF3F4syo7wRSVS0vh
-wkx4CdfGoOy5uQUKFZcpZk/Q4L+gifHD5fMV7H3VdtedQNpGNzH+kWmJNIvwMAnc
-AvxxxpIouFfv/Pt30u1fnqg/emctvcsp8HX46eZdG1TnBlydfAnyOQRh+LHFo+Op
-wDydKJe16YKXI5SQIE1BwAfBC2PO9+sObks82o6sZpF3N8k8DCyikar6RLy/arBR
-ENx3HTnmyYZhsEbxKCjkHSIAMx0Yiz9mG38lo3/gbfd9V7x9Sd/yC0WUgXIfluF7
-QBhhAHABAoGBAP+mnCo7YmZZfNlu8xFx/MAL3FUWyMO+2+6UH36LQ0lQkPP7/MKT
-LK8cNez7SVRvjRmOaBEjK3uRPCYND47ftev9PcRPZATzfzCoNxLj/N+TUv8gCslG
-7kNfpA7wtjG6eZVsnRA0zcS7w5rCg6tWkaQ4mTK1EhwtSey9N7r24JAfAoGBAPEd
-bDG41FgNyswlBjcGaANvJVmVlDooksF1MM8lfJD4LjelrKZHMp+KEwPydH8k/23j
-m12HbY00skE2lg0rHnNQVwkOCa6JVmEsoSlEyIk79oUx0pQwwaOQ1bcUKZAHE93W
-wXzJQYYDucS/ohxlSpjEDdgBPIilI3NXFkIXzn5xAoGBAKJTm0Mhk9hjJ+g0D7jb
-BN64aT3KCs5nyORTPzAtoxrRQkj5jsPJiYziv8bqw+QONKyuhJulFj4OuP98OY3B
-tJTUpryYoGyYZAF0PgwLoYwg0olWQiMNm8pB1zz5UOaAfiUH4y7gKGurwYbpzYsk
-m7OHkJbm7Enh49ejSdi4W1yHAoGBAO2JAvHpGKi2zbdYMks7MHVRpgYfaivxlMKp
-5S/tyk43cbC4suIM+j5aFGmrDkHD/TARLxpxNOgLpiDA2gqXFCSeXWA6SCd+fW62
-PP8fGEC6ph6J+t6rOdkd8q2uW1Pc5SGDVJLO4pJYUUcXU2mOEHN3kfvfG/eyWL5k
-aTUrpu7BAoGABhRWpvc+fc1+6HP9Ivw2eQ6HE0bbISVYaT3LMcqc4oQWjQL0IPQU
-1qAh/HxuPMwd1TlLOLmwUNNONrdvoNMxwNosM1WEap/yHzSwwn157n1jhSadlObn
-l0p2sITUA0TdKm6g0VYAbcbuABFQ+/8tvmyI/2LrTVZjTvZBA56mXQg=
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILmK/HpqAGx2e2p2+p1hFIBNru6/ymTF37D+Sz6Tn4+moAoGCCqGSM49
+AwEHoUQDQgAE6UMrsf5qXF19btWmZzHn278DryNp/nq8DqaxxUmhPA62wBkImm/T
+EA4RvS3HhPZjGpwe5LEVmh4J8+6pJlF2Lw==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/infos-0.ca b/regr-tests/pki-data/infos-0.ca
index a57013f..42821b8 100644
--- a/regr-tests/pki-data/infos-0.ca
+++ b/regr-tests/pki-data/infos-0.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+CcY=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/infos-0.crt b/regr-tests/pki-data/infos-0.crt
index 83e185f..595b7ac 100644
--- a/regr-tests/pki-data/infos-0.crt
+++ b/regr-tests/pki-data/infos-0.crt
@@ -1,25 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIEIzCCAgugAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQxWhcNMjIwNTIyMjA0ODQxWjBJMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-EjAQBgNVBAMMCWluZm9zLTo6MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMe27DmxOgqNh5R9FIm5SRv05kFD5JqrayARmkUgvsLcmldZt79F5RURpGO3
-DFHd8jPu9C5Gg8sDGCgeGgBZUdoN5ieO/DEs+8vdMYOPb/qY0749u0qjBV7hS+oN
-aPxgauA10wVE3yWV4Gynn7UgEgodFxRtIaF9m3ZUE7EjefPK5nDkd+BVL6vtajLC
-JQtox/pcYgsUjIbVNwRkFnYwdUWOoAfWHnuodoM5T7JmYx1thvATU1RJeQGFDvIK
-s+lLMtvdZJqlJhh5jt713fsRhKfI268qCYC5O+rUm1TQe2JCNvRvA5ftnIRYLYVM
-vEL5hOjfxDoIvm8wsWT7JI9IOx8CAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxo
-b3N0MA0GCSqGSIb3DQEBCwUAA4ICAQA0/9zCdlZl7LfiqQSIc84cgJFmSuaVNXRf
-miIjtM4Uzcot33JOiwfaKiJi9NnyDDjwfj/7xbBkrt0xSLxwTuPU9hpbfoFoQRzo
-KprR8tGOGIIF8Vvypkoo/T5iPDbOHxIthw80r7FjSG7dqhvGP/2avLOexb+xsypU
-hgWlc0qaCp6TcWzFaCo3Qabtubv7isBH1bU7UHDvmPynHTANi8B3tcy5NSjjD8Hn
-PjNIqwwVhQIqbCfO5o8RSU4ss6deLSNtoFIeeA0nfvuDlUXNitkK/GWB95LMchX8
-WWdNWhMoM/k90GroNjiwQrzsaZjiOqu8c54S3MwdG1rO0fkfSo4FrVIr0ISfywFv
-37FvdxX55fZ4vAtXKUNUD/x4UlI/A+53sNSzwcyH6S5UZq8IvV1JgXOwChP+rPLA
-JiHhD0oHmIR1hjtfJvWpO85g2CqKve7yM9iottQvcWq+liRDvKbwrJwFTkuKsK+S
-td5wZYRE/ngOVMEL0rNBd+3mYTPtwu40a+DEdckqk0cJAx2cgFaRxEof0DWyUE/q
-J1hS8B9UYvqtufe2jfXqGMZK/tmPyAtbFutibB0wSJ5tiu+5sbIIZGzxYhHAjTro
-FfHcXZqJvVjeCJfSIWoN8RVhz5TJwhGkoE/NsiIrVemcMHGFKRjE9bvOuEj3vGKc
-0NLRypONVA==
+MIICGjCCAcCgAwIBAgIBATAKBggqhkjOPQQDAjBLMRAwDgYDVQQLDAdFeGFtcGxl
+MRUwEwYDVQQKDAxCYXNpY1N0YXRpb24xCzAJBgNVBAYTAkNIMRMwEQYDVQQDDApU
+QyBSb290IENBMB4XDTI0MTEwODIxMTM1MloXDTI1MTEwODIxMTM1MlowSDEQMA4G
+A1UECwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJD
+SDEQMA4GA1UEAwwHaW5mb3MtMDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKrt
+lOCWKbYvjMV//em2ewLo3YJCQBPQE5MapTVbTlv8l6FiHOgz51GUpyarhA2W+KvA
+lEQi6R0ie2pitpYY/XijgZcwgZQwFAYDVR0RBA0wC4IJbG9jYWxob3N0MB0GA1Ud
+DgQWBBQBlfw4Rp4wk8a8TFWFC0o0uRIyxjBdBgNVHSMEVjBUoU+kTTBLMRAwDgYD
+VQQLDAdFeGFtcGxlMRUwEwYDVQQKDAxCYXNpY1N0YXRpb24xCzAJBgNVBAYTAkNI
+MRMwEQYDVQQDDApUQyBSb290IENBggEBMAoGCCqGSM49BAMCA0gAMEUCIGXgWzyG
+hxljQF52d2FGOckv8zMkuMhFoy6vMNBnEkJ+AiEAuFw7C51/26QIprSF93BWDa5A
+wsc8t/+G3ZDr0tAzBCo=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/infos-0.key b/regr-tests/pki-data/infos-0.key
index 0c36baf..e48717d 100644
--- a/regr-tests/pki-data/infos-0.key
+++ b/regr-tests/pki-data/infos-0.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAx7bsObE6Co2HlH0UiblJG/TmQUPkmqtrIBGaRSC+wtyaV1m3
-v0XlFRGkY7cMUd3yM+70LkaDywMYKB4aAFlR2g3mJ478MSz7y90xg49v+pjTvj27
-SqMFXuFL6g1o/GBq4DXTBUTfJZXgbKeftSASCh0XFG0hoX2bdlQTsSN588rmcOR3
-4FUvq+1qMsIlC2jH+lxiCxSMhtU3BGQWdjB1RY6gB9Yee6h2gzlPsmZjHW2G8BNT
-VEl5AYUO8gqz6Usy291kmqUmGHmO3vXd+xGEp8jbryoJgLk76tSbVNB7YkI29G8D
-l+2chFgthUy8QvmE6N/EOgi+bzCxZPskj0g7HwIDAQABAoIBAFmL6kU/8r9SkC0D
-HFdYTbCMUUWINJMpMyIw4lQGh6IFmep6nsnThBC7VVMkexCmDHg+txucoHFBVO5/
-+LaZVfsIal7oXKmL+uaAqjfL87CQH7jYIwcnKzxMlmY+Vwl6DdG0MIbXR5qppfPy
-AMkMtSn1uyh8eizXjgIzVpUBTCgD0h0dqIYTL16H6wE6bIsWPfhJa7QE7p4fVAGw
-9Zb5L0/+J1cHKDg1Wb6fSVBLpybfDqnE8CiMeQXpH6mrSxhkjpLH341bork2S3RF
-2CkPs0HbVycYxFE59SubQ81NlsW3j3S8gOziS1IuZOVe7dSiiIgxB0tgjGoQrqGl
-UHmLrukCgYEA5f6Riz2cp5BIaUulwmPTR/fIQYmke4K6UjEWDcRuOwrG49BCgjEj
-qd8zIwKW4CZTv90UeUb0HSU8WzPL08Z2A192wVL/OGMCSku3spa37xsWCB2tvDgG
-taYh45KanPecxpFgzaskkHpaQKVGlYzwIR2Fl2CPvd+D2/Jvulq76BUCgYEA3kvf
-F/0Orhgu88XK8IYfkyv09cvA8UTwj7xgFScr22qI8gmthr5JXfS2tq/1gBpoh1/E
-vDErNtlP27uSSRvbhy+cL+fikBeARSvdULKBf9xa7oTqObMaOlJR3R6ATYjY/GlC
-PcDrOxjC1x+a7ogarnmy/TNPuhXJJDfEA+TDT2MCgYEAjlVi4Rb6EcD67x7/sDNz
-F8DCT7zM7BrVD/SMv2xnA2cB+w5xenzKo2AcF3iMwp81iTFacEt222ql1ZNSevcB
-Jck4hx/EDrNHQY9mWcFohzLuCYvEbw0FKflsU5fw019xyHlDvURC1p7Bp+wgqICW
-QwgwGqSJkGn5Am8gseVhEJkCgYACCrxf4gkyfDJiNtzoXLMJjQvQ/jAlhzaWe2p+
-hz+V4mKjpocbh7/wxwCuqOseZB+1rqGGAQWemVxsbkqntUPM+Bj9L6obHLwm5oI/
-7YPXAtUq/7mPEiAZjQwHdfJDxBAKMYVUP+NpRY70nuuzaTilhaSpQsFmujCAzqpU
-RtOsdQKBgCiO/qGLZqfSFM6vdaYtzM4a9IedQYSMjpjqUNSQQ4kPnLLlnPxCjWLa
-885VMht4dBrwWKUEb7+DRQVaCDX9V1LNKzilYnIOHQQ2UYAiXQkAIGOvllJbdB7B
-Y+pRObz37Q5DOcwK5FHJKMZqPJFXNVk/LjJ/myuE0U2qz9DV/H98
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPGpXk8CVnJkSSC8AN/EPuNbLbS+pZH8CJCxfGPNmSUFoAoGCCqGSM49
+AwEHoUQDQgAEqu2U4JYpti+MxX/96bZ7AujdgkJAE9ATkxqlNVtOW/yXoWIc6DPn
+UZSnJquEDZb4q8CURCLpHSJ7amK2lhj9eA==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/muxs-0.ca b/regr-tests/pki-data/muxs-0.ca
index a57013f..42821b8 100644
--- a/regr-tests/pki-data/muxs-0.ca
+++ b/regr-tests/pki-data/muxs-0.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+CcY=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/muxs-0.crt b/regr-tests/pki-data/muxs-0.crt
index db2a81d..1bf9995 100644
--- a/regr-tests/pki-data/muxs-0.crt
+++ b/regr-tests/pki-data/muxs-0.crt
@@ -1,25 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIIEIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQxWhcNMjIwNTIyMjA0ODQxWjBIMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-ETAPBgNVBAMMCG11eHMtOjowMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA1+llowMdHalG80S5GBjfDaiUWzf5oIgQP2ohGTBWd5iDq/uHX6jgcbjgKI6b
-HtD5rrfA/5bfky53fEzXYTKNdNgSfkAq75ZcP4IyIG6fy+0l9XMYnIukKwipqT/l
-33NM5ksKykKIIdidPOeXnLWKHdhwomcJHMOY+4j5CE19MY0V3suynmnp+KiXavQc
-vrlb53xjTDcOyBJD3bzh2QrGqqKYzCNxlvSRp9WvDAqimy6O5ykEuBp+WdfqsYHq
-sMU9tyto2RDDqxRKR0HmRiTJ2JX6Jjoa6GMsfWpRZhVsqx17bwj2CfTUFEaEaan6
-0bGU4EVieR2nEwjoTw82acfKVwIDAQABoxgwFjAUBgNVHREEDTALgglsb2NhbGhv
-c3QwDQYJKoZIhvcNAQELBQADggIBAFDOs2CQmAdyEsPoriz5oRD0wH6NL/Z/jbUY
-EId4Y46q7pXqh+EDS+xbwpi8DR/S8DOn1EFs6VtQ/8Ib0wSjyupAWtQOju/9jcIy
-5xEVXEAap7NulW0hGjGMRQVFsVwt0sWP89SKIFGjnexU/DikjAVjxDzQa7VW570Q
-G4Vbc1AnlinReE+TPhwwKycor3HRjc6pWZymrE7xP9y0ab89bY33PcKtZdA9Auqx
-2Z9dthgQYpk+LGW0apVB5FMS9nSsOPG9JX4/opATloRAcHSHijQZPub2Zpo+JeAK
-JYGX7FxfcrpNWiDL+CJAzZKnUy68+RgVubfXNna3IDU8YzdOQjcfUYh8+sVCHWwt
-NtPDk0fj7gPHobgC8jinU69Pk/vhNPYTkmX81g4Rf5MRanFQiNz/PPFkyil/Lwr6
-2EUoD4Noajc9jggSoLINQP29E66Fmt15apgNcS5yWPR4/Jc/HSGQB03Bqfix15Qj
-sJtwj5RcnK3JPE+525RRJMc90wrfWHCrx7eL3Pe+gzA4EdA+HHnkg7J9NbMe94VE
-akmc1rimT+IL42tVAmtkvdxHufDo68k37Kimv+rOcbK5K5fGfa44wqOFflq+G1az
-On8uRoAVfhYiV1dFiAPfNcqGxw4Qb1N3Izwu2qiWnhYtSvbxzF9RNckVT9GrWyoC
-HcFTFCY7
+MIICGTCCAb+gAwIBAgIBATAKBggqhkjOPQQDAjBLMRAwDgYDVQQLDAdFeGFtcGxl
+MRUwEwYDVQQKDAxCYXNpY1N0YXRpb24xCzAJBgNVBAYTAkNIMRMwEQYDVQQDDApU
+QyBSb290IENBMB4XDTI0MTEwODIxMTM1MloXDTI1MTEwODIxMTM1MlowRzEQMA4G
+A1UECwwHRXhhbXBsZTEVMBMGA1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJD
+SDEPMA0GA1UEAwwGbXV4cy0wMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQ8c2
+KZe7BwiI4KN8DsmddE36i6veURXg9LdAo2TysRvd7qPxG0tfzK4aOiNv5utTMvrj
+p/jNZvcqECyaxvXD5aOBlzCBlDAUBgNVHREEDTALgglsb2NhbGhvc3QwHQYDVR0O
+BBYEFCenH5gb099qBOANSe0pCeQ6hi4HMF0GA1UdIwRWMFShT6RNMEsxEDAOBgNV
+BAsMB0V4YW1wbGUxFTATBgNVBAoMDEJhc2ljU3RhdGlvbjELMAkGA1UEBhMCQ0gx
+EzARBgNVBAMMClRDIFJvb3QgQ0GCAQEwCgYIKoZIzj0EAwIDSAAwRQIhAPDuX9Fu
+34umYxSKWlDixUmfNmqTw0llJlML0neVz32fAiBKzkSakhMF2uafbh427ZYN8p4E
+pqCjozMzMgDhUqDd+w==
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/muxs-0.key b/regr-tests/pki-data/muxs-0.key
index 489bf5d..d594021 100644
--- a/regr-tests/pki-data/muxs-0.key
+++ b/regr-tests/pki-data/muxs-0.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA1+llowMdHalG80S5GBjfDaiUWzf5oIgQP2ohGTBWd5iDq/uH
-X6jgcbjgKI6bHtD5rrfA/5bfky53fEzXYTKNdNgSfkAq75ZcP4IyIG6fy+0l9XMY
-nIukKwipqT/l33NM5ksKykKIIdidPOeXnLWKHdhwomcJHMOY+4j5CE19MY0V3suy
-nmnp+KiXavQcvrlb53xjTDcOyBJD3bzh2QrGqqKYzCNxlvSRp9WvDAqimy6O5ykE
-uBp+WdfqsYHqsMU9tyto2RDDqxRKR0HmRiTJ2JX6Jjoa6GMsfWpRZhVsqx17bwj2
-CfTUFEaEaan60bGU4EVieR2nEwjoTw82acfKVwIDAQABAoIBAQC7QLpbBCpOPS9B
-cAqvMXLRn7D647LlXNvqg5qtA9UZ5/XaRE0F06rENjiCNBuoQEkrFEaX5DuGpDgQ
-X3wz2eoAuhxfzjruixL6KWpb4lVIQSY4l1dy/VCl2d963+X3Q0IgQFjdTZJO+FR2
-K8y7pl5gwAP/dSjb/29AR2zjnIDFZSSZhlA2TGZnUGNV3rXOt1FFlZt3Dh7DFt3l
-ohrJcAdfUQBFkkqQtBXEIjGAUx2N93cC6e5lQEvKRa8dmOs6Gf6kCAg7fvsfVvkE
-5+FI7r2K/i2Ow1bN8pugWcmYWE2geCfloETH32lbsn22LqeX09ODAXvTnY3RZjjr
-5lxAda1BAoGBAPbDQVzoO/iL6MkJy0ta52uJumQxdMcM6WHAMfwKX7m1pt5pL9j4
-9nxYkJ9V5OG3AIeBBnA0nLA0sSE7mSPcNjusgKrB/Q3DcVzlZKBKuO+g/7Y2eiW/
-C7a/XJv4tjnqZqkKn/fJG98bQD+FVVnCZF+gC6AugW3EfEVCpgWSP3HRAoGBAN/+
-fokSpPjuB4HkFRUtmsFwb8HYxIrDfBz/sujapSx4WJys5Wq3dJK4BlAZSZHvu4g2
-ZaqPXrRqYXx40ZhhUnGGeH6RRA3UvwD3YpLhV8V0a235D2SFtoGAqpD2RtvNtGpA
-RODHPzFd5bwTEl3rqMlynLoLS59PTky5RQ8Mi5unAoGAJmqxk2BIbeKCREI1Fy84
-1iIkFZMphg+5idFdNsr6qjPgncGshFAGN8emBFhgAM/30iDBOtjGCBy78tuPdOjE
-vLeXdH4tAmaKEJdZ+iaH8i6TgO+sRpIepb3XEiU/YXbfsrOHwhDaOPrKHtmINygv
-bj/Bb5et6MPtQO8mX7msDPECgYEA32HgMzciyxYm6oTZ+arnYO6OpZVWPMTDa/Ad
-LleOzhCe3nEWwhx+5ysbMJpnYmDgdvE45qXgXrCQ1B9xdzPnkkv2stKQOfLnIUGV
-TsHoVITL9nqhvTAUWIZGlBbnh6FXwXaiukA6ZzMrPysN8Bhq1au1XVySaCghACbs
-Fhv+xpUCgYA9RmUahfUbP8DIeTS7wzAmOIOHWs7ocYoAH5pGlw4LX73QUCSEedPi
-gHvmCDqK48GTotJVumH74+4CDgl3yHncDlZUbyUmw/JLWM6wtk/FNq/FyouK8PK2
-88sbGUyjgxkPU6C9+T6edhSQqJZRtuiYg1/ZdaS7czK7X8BQHbvIfQ==
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINos9K0MMuQU2YNtMhrlG2ROXTawg2uYmg/3d1g1K4ogoAoGCCqGSM49
+AwEHoUQDQgAEQ8c2KZe7BwiI4KN8DsmddE36i6veURXg9LdAo2TysRvd7qPxG0tf
+zK4aOiNv5utTMvrjp/jNZvcqECyaxvXD5Q==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/tc-router-1.ca b/regr-tests/pki-data/tc-router-1.ca
index a57013f..42821b8 100644
--- a/regr-tests/pki-data/tc-router-1.ca
+++ b/regr-tests/pki-data/tc-router-1.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIFAjCCAuoCAQEwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UEBhMCVVMxEDAOBgNV
-BAsMB1NlbXRlY2gxFDASBgNVBAoMC3NlbXRlY2guY29tMRAwDgYDVQQDDAdSb290
-IENBMB4XDTIwMDUyMjIwNDg0MVoXDTIyMDUyMjIwNDg0MVowRzELMAkGA1UEBhMC
-VVMxEDAOBgNVBAsMB1NlbXRlY2gxFDASBgNVBAoMC3NlbXRlY2guY29tMRAwDgYD
-VQQDDAdSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw9uK
-AnUd4May00pDyx+FLedjIFy57Abw9VTaVMAtF2DO4M4aBgQHXhKGt/9WQF0eorYU
-3m0mbM6J5n8DkJB0h0YwgnHTm3BNUNf5mwaKIp7q+3iVbgiZTYRbiIyKluUGEbkG
-vxsRizdDt0z8wnKd6EFbC53aFXeoxMzy0A+eTHBWr0VfBf8q0lGC0yta7HvrFv4q
-UzHmzctVcfyxG5+SovFQnfoVr0Qx/GnKEThEiflrXntlcIGiyl5fFHz/7GCvtnNz
-2GziFWj1JbobNJjHy9EgFYPUPSLYzvlS6QRqTv83JX/iwq7Q1IiBpHdJygm80yr3
-FSAEu7yKXaDG4bEE1PPOqmo+RvuCgRlw/rtIdEz6iLTPO9G1KtXQCc4/bletwn8k
-bFXwLe0dABRF81UgRK9OCF1McMlrINEViV9q98P6ADKn4O39PrSupuqSJG5rijjN
-1/7W8kFcwWtk3rMgQMnqtc7X/+CsK1MAD/8Wspwn3RcQGWYYA8yYAzz9h2Hypiuc
-ef5WVlSuwL696MPhiRZ+FGtFY+30FaiTBJtIyCJEdUo6T0uEg6xN3DaJ/wuNuaMf
-JKMGBWYv+5YlLKgY+ti337VlQ1CbfVPetLExzxB9sYhRVs03yA7SmEa9rDO4Ucp0
-xMPZbJ9nNB8qnP4lHZdD72HOJJDqLdjOxZdVjiMCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAgEANWyLwBRTrzqO/mNMX6A0DTDGjRGD+w3rMVzFmliosn+7CNbHQl1km3g8
-zvvX2+W0GBkXZm0y3i3MfdiUlW3/l54ysvIkLB0RL3RS0OxO0U9LjRzo8W32D9Gw
-wO2aBE3qYGx2PJMghaJNTUIkqNjISmbvTKvR/1qjHJytJP1OCn1ssEtF3h+qvjNW
-6GUDhHcKka/9o/XjWSq6nB1i1LDKtfkkoBVDk6xN7UogeJfjHbKfYVHl22kWfmTW
-spXG5uIYzkOxWIuWVeOBmUyZqSnqbjDIYtOzLPJ+FxYgf+s6fX+MYjzmOsiHpEUb
-jpX5qLT4Mn0DXwuBQ2cV+hH6SZphZOsVt/g6kRrWnxQY+tcKcBSVxlHv5M8JWUMf
-p/rjDmUUFPkCi/Rd9mCaBlsCB71q8DBNLBIpWF0y5bARkSGXmesbpF4iT4l8sJhy
-IkShtoEuThEi5BGFm8OItwglc//oyqK+fDN5R/GIvn10tAYD30t/VYapOE3C8LDy
-Yo9+pMWxZIO7gr1dOe0Fi6JBIdh1XSnF72FCv9q7YQUnX1EkbDSyuOilE3qJYkOj
-EwdlVXXhIYsEIX66RlVYidUgIF9UabMQbJ4wfec+bZb0KHrvEyMaLC0UJlV6d7wK
-gKj/nR8McJ3zETt3mmvNwM4TlKR60F+SDScVmabETxe7u45M+/k=
+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
+CcY=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/tc-router-1.crt b/regr-tests/pki-data/tc-router-1.crt
index 8706563..cdaf52e 100644
--- a/regr-tests/pki-data/tc-router-1.crt
+++ b/regr-tests/pki-data/tc-router-1.crt
@@ -1,24 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIECjCCAfKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQyWhcNMjIwNTIyMjA0ODQyWjBKMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-EzARBgNVBAMMCnJvdXRlci06OjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCmyGZ2I+Y2+lhmBaE3ROLLjOn0Y5vVZNr5J4HhylXHeVI4AWG5CaRu8ndD
-NUOdPoZtKZ91ul4NnH4ALf47AgDbmWSCLkloBu/A1JiVC9U051oQujF4KkViOUxT
-CT6BkuE1+FpkiKngu8vGOielD3h5v/KGDuMuHakjhEBVrnC94KUUOWIjapx4JX8f
-IU8KNuIZK9xJ7AgQLclKRrEWJRjQA79tZvkW1zIw9gXUE7Q8TNKYY+sC7OWyEH8t
-fWgwz+8iwA9txEN2YUgRHBsQ3/27UjWDxYxT2INF7ok5gBSda5SdkCdfX9Ap5eTw
-u+67Vq0FE8LHi7OGNpM7agW3RKJLAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAJyi
-PGApEGr3CcnKLCgCpZeCnew6cilJhl9zJKbZ5XNuqNOoN2YhnM+hW7BnAWrOaApm
-387S9dNEcfJtk/w+aK+20G4t9EDNmjEoKrKit4h8tdpCaiBsr3NnGxlhoM8wx6DT
-i0GP/vKCMyTeaI9JU8vxd028tI+jUiwrrrY8iSQ9qUTAzPY7ksoaSVuzyLROq+kl
-3YiozLSTm7bN+GSDz2jkyCmsuZIU7MBE2NQpQWRavhtCV2cIQEa2blVJlqid16zR
-JulbnyOxKqJD0DYOvEtEEzPUUgPCrE9o59PFnzjY+j1xhlPIXPCbdknnChv6RU3v
-5vP5egUGxls5rNRsMH7ITnCXD690wRNUu5OXoYIZMZigvjG/af5H/ULGuFyQLzjs
-v6dc+PHKwi3NhjsxVhMpK4TfOXQbjitraqMWaOubxHCQdcB9dQhAOA/4hiCheLKA
-6chVnMZ9Qh2AAjzmpP/4ktb4YODHbhqmHD+MN803DCRWlU3Ks/fDW+LufHA7Ub0t
-IjiuC2EYbJaWITgC69qzMB0UqRU1NKWjHFAiNZWB9cGmgfWZMCea1JuH1iavtgyD
-VI0gSHg13JVSmANsZOwdBOUkIzgd54kHr+h+jiuLn56acsvtJRAcL9sjgnPOKTlx
-0MHWlxsN8GUm4+NFPhUuiAKVgjb2rOhfYTU9WQN8
+MIIBfzCCASUCAQEwCgYIKoZIzj0EAwIwSzEQMA4GA1UECwwHRXhhbXBsZTEVMBMG
+A1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDETMBEGA1UEAwwKVEMgUm9v
+dCBDQTAeFw0yNDExMDgyMTEzNTJaFw0yNTExMDgyMTEzNTJaMEwxEDAOBgNVBAsM
+B0V4YW1wbGUxFTATBgNVBAoMDEJhc2ljU3RhdGlvbjELMAkGA1UEBhMCQ0gxFDAS
+BgNVBAMMC3RjLXJvdXRlci0xMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEnMm5
+FZPqTCVyRODTQHdsZIv8ihyNDgFXWHPLzMTMn2mIPUNXoEqfg5lme2aREClMukKs
+RtooGtxp/OTIJNHQWTAKBggqhkjOPQQDAgNIADBFAiA1iSmeZKzcTIIsxwp0EQFU
+KgQ7zVXLDLC8GOuYVlDshgIhAOqIUxKlTJ6s396o0m0nZZLT47n9oxhToSrLefYB
+4z4u
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/tc-router-1.key b/regr-tests/pki-data/tc-router-1.key
index 2d7a465..248f234 100644
--- a/regr-tests/pki-data/tc-router-1.key
+++ b/regr-tests/pki-data/tc-router-1.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEApshmdiPmNvpYZgWhN0Tiy4zp9GOb1WTa+SeB4cpVx3lSOAFh
-uQmkbvJ3QzVDnT6GbSmfdbpeDZx+AC3+OwIA25lkgi5JaAbvwNSYlQvVNOdaELox
-eCpFYjlMUwk+gZLhNfhaZIip4LvLxjonpQ94eb/yhg7jLh2pI4RAVa5wveClFDli
-I2qceCV/HyFPCjbiGSvcSewIEC3JSkaxFiUY0AO/bWb5FtcyMPYF1BO0PEzSmGPr
-AuzlshB/LX1oMM/vIsAPbcRDdmFIERwbEN/9u1I1g8WMU9iDRe6JOYAUnWuUnZAn
-X1/QKeXk8Lvuu1atBRPCx4uzhjaTO2oFt0SiSwIDAQABAoIBAAilv1pExjz3gfnY
-NOGuuqufJMo9F+laj1f3ym4wlX4ANlkdCToU2+e8vp5HdrgCc+nZDKGIBjRids3/
-lHzuv6ijLWjqiXfRVEEFRNwFfwp9LFhNrx7x4iMToXd0tT72pKKtu9IWm+hBFHG0
-tjWCtdZqM2LsBq9vbkOfKc7HeqT9mV8WbFpJtFh5IQ2f0Owf09peBNIBriWZwwhd
-5GFSMRpIH/zkviNKe2xwkM/4L4KMyV37yL1NpGwq+iZZZktPYKk6BNFWtCKkp8A5
-OjQezuGnfmy3Pt4eWX33nN4JF+7o29Q/CEr1Ev6Gbtd6ae4HbNStLm8jZITSP5qr
-qXS7QWECgYEA17U++8uqqcCQNVsEEJOwrba1Yeqojrh58xnjqOO2CC1oHyU0gE9v
-ZHxB5GYy1cZ+NZ+dzAgmzzeCLjec+RBwZAz6gpNm2yPCf4rZhjbZbrlCqx6ghVuO
-2Hwakznq59HDpCnhZPxJbtsanOO+MdTl9mUksTTiMINpcYWkZs9kTbMCgYEAxe+k
-tPFJBC6oTyI4xtR9d5JjQKk1TH68E4E7C99eKEF6whuKsNQEAGoekJai+uH4gfFN
-048pZ46kI/V1Z7CYgFdqYyn1VFT4tSvuUiak2DPBe+oRBMHzz4eY+8AmlJyVzWlf
-KUzVvk48CRMTByaGzFCGt3GtTfThl3hZ4JI8/QkCgYA8bTqaoOBLM3VybO/DkQwC
-bdd7+ZeEe6s17b+31SpuOgIcD3kYpKgI10JCMFr3ReafMPqsaHAuxlcCiXPA1dkW
-PgiDQbWjl+3pesUa8wyQFvfVJfxDv3VRsdpj+eqTTFDpEQ5iEsajdl+LKcVjAkf1
-cToJJk5i1r1YHt8CKgDoPwKBgQCs7DLh3VYj8Dscf1JI6oT+fIZ3jBxDSwk2pRUX
-xzn0Q1hi0jr1RxSD5DH1sZSLR/WaWFzcsdrDXQurWpsKTm682SHZpmNtHJr3dHzN
-inNDatvjTNc3Z9Z//P+7GODbvnzlKuR3KWgmzSSH7QEXoyHqx4MaKpb0Xzbi5MLo
-ffoIOQKBgCNkYLf9d5lIitjvet/szVw4ondlQheUAL8hHXB8160Ev9a5vZmpFYPx
-D+QhhJG5ILFvy3nQVn3FthiBWYGQlveLASZSHjK7fRbNNqhosW6UPePoHbD7REnr
-VvH79ZYxCf8OTpteX/AdtW/hvI0gXsG2RoJ7vBHvGcU1TjdgYdSl
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJHolvhcwWQnWmZYjOvRNgyZKhmpSfoSuLKo62BCyfDxoAoGCCqGSM49
+AwEHoUQDQgAEnMm5FZPqTCVyRODTQHdsZIv8ihyNDgFXWHPLzMTMn2mIPUNXoEqf
+g5lme2aREClMukKsRtooGtxp/OTIJNHQWQ==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/pki-data/tc-router-2.ca b/regr-tests/pki-data/tc-router-2.ca
index 8344ba6..42821b8 100644
--- a/regr-tests/pki-data/tc-router-2.ca
+++ b/regr-tests/pki-data/tc-router-2.ca
@@ -1,29 +1,11 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+CcY=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/tc-router-2.crt b/regr-tests/pki-data/tc-router-2.crt
index 85032f8..979a1f9 100644
--- a/regr-tests/pki-data/tc-router-2.crt
+++ b/regr-tests/pki-data/tc-router-2.crt
@@ -1,24 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIECjCCAfKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20xEDAOBgNVBAMM
-B1Jvb3QgQ0EwHhcNMjAwNTIyMjA0ODQyWhcNMjIwNTIyMjA0ODQyWjBKMQswCQYD
-VQQGEwJVUzEQMA4GA1UECwwHU2VtdGVjaDEUMBIGA1UECgwLc2VtdGVjaC5jb20x
-EzARBgNVBAMMCnJvdXRlci06OjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC74duk/4n3N4BUv/eo3HZlXkwfWai5SIb8rQxGum3F7YP73eOabjqCxDBd
-/gBWMcFPYHmGC5TfPtGaHgdqJYIMLenTUsRSmqIONzyMC9DwueGza/o2B4g0Xhff
-e5Ctp2XyZLfiKMn/r6mErjrQhnbNfT1euXrcyCgjRgJDp4xlnOMDZdT6O48yQLmK
-XKa/QeW9MT+/ZeD+YHbn1dq7VoSoL86f3+PdG4UNJnnwydmf1nXndHarH7FguSAf
-p6KBc75Hu4ytDSdHCJENaH+tcPR0wi3Kvva5MRp0BY2eNMv6QFtCJ6myNxZR4I8F
-C42ozSjyb2oA4MRsp0rFbRmj8a3RAgMBAAEwDQYJKoZIhvcNAQELBQADggIBALLY
-OidUmGkamyXfWaTHTdo9NU73NYjr9xQWoKee2+oe+2HVb5ltOoSsQNt+9kmenX4n
-jYmomz6lTNar97/49nmU/7HiK51NspWfqBOBHMst2z9EeEFJTswIGU3wlsP0ZARe
-1LeXioCFje3COveY6CaOwcVpqFTKeJiYJcCg5J2yKyv+vF6mlIQGggJWgvw1ATZG
-JblS0lXVNL6p8hw3UHzoKRubNmHVz3OM0IM4hWWM87oQlOGE7lXUAXZY+0x7XfT6
-0IQGZVSjlyNLeIqt5NTJcCS6e/kZb2eHSWu0SyQEN8fIYFv7wZ+QwWVnyfMZRm+D
-8O3Uhpp+HjxwcS1QodAKpTbjGUwFQQJY9NEPdCIuwEWmbDOO0vCnhW4MZiJwuNN4
-w5QAK4kb/ATegSP/PM5KCosPyo0io5unXCnT6DKj9r47/lAoiQk6YcUGoILNBKXi
-Hkx0xHl0uRa+UIbiLjiOUhySLGuoU5v9TTRJ8twevG9ExlAyyInvtyj0CNR9g820
-pu5Bt8ONrINQA4AYgw6DaD5wpNat00wgswanx606ggHyS8UmfwIqI1MI8Dpvwuwn
-XbWslbxDU2+fmbumoZQX23s9m6Tu025n06yNVUunMxBha7PJdc2YT/vLQ5yXhNDw
-3u4hFbTYd+IRfNR7ohV5FD/zFVfEke5iBErTThod
+MIIBfjCCASUCAQEwCgYIKoZIzj0EAwIwSzEQMA4GA1UECwwHRXhhbXBsZTEVMBMG
+A1UECgwMQmFzaWNTdGF0aW9uMQswCQYDVQQGEwJDSDETMBEGA1UEAwwKVEMgUm9v
+dCBDQTAeFw0yNDExMDgyMTEzNTJaFw0yNTExMDgyMTEzNTJaMEwxEDAOBgNVBAsM
+B0V4YW1wbGUxFTATBgNVBAoMDEJhc2ljU3RhdGlvbjELMAkGA1UEBhMCQ0gxFDAS
+BgNVBAMMC3RjLXJvdXRlci0yMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV01O
+XJUN3NJYa/DGnSi21H+EqVX4mjOGwJTAVXmWHkZky4PEm/yUOM5Rumyd+WM88mau
+G+eFRjZkIk0IOnBP1DAKBggqhkjOPQQDAgNHADBEAiBAvGMKCZbYRRQilVKfc6uE
+QNzd08PkroPj/tuceDDiAQIgMw3M5Ss1bBFkS8YO7MBHGUTrxN2nhZ2T2uqvAW1W
+5fA=
 -----END CERTIFICATE-----
diff --git a/regr-tests/pki-data/tc-router-2.key b/regr-tests/pki-data/tc-router-2.key
index 21cabbc..36090d5 100644
--- a/regr-tests/pki-data/tc-router-2.key
+++ b/regr-tests/pki-data/tc-router-2.key
@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAu+HbpP+J9zeAVL/3qNx2ZV5MH1mouUiG/K0MRrptxe2D+93j
-mm46gsQwXf4AVjHBT2B5hguU3z7Rmh4HaiWCDC3p01LEUpqiDjc8jAvQ8Lnhs2v6
-NgeINF4X33uQradl8mS34ijJ/6+phK460IZ2zX09Xrl63MgoI0YCQ6eMZZzjA2XU
-+juPMkC5ilymv0HlvTE/v2Xg/mB259Xau1aEqC/On9/j3RuFDSZ58MnZn9Z153R2
-qx+xYLkgH6eigXO+R7uMrQ0nRwiRDWh/rXD0dMItyr72uTEadAWNnjTL+kBbQiep
-sjcWUeCPBQuNqM0o8m9qAODEbKdKxW0Zo/Gt0QIDAQABAoIBAQCWbKuFvE7Czv4B
-XL01xmVInaoGw6sxxV7GOOqGSkcPXC363tmW0EAqaFdtOasdV7K1EcHaT7V+0/XP
-FdHL64HmrG/0kOS8Wi/7f8ALRH6h7cFF/OKUlY04mEk21eCtGESoQHl1KkEoZIUt
-xK00PSQrO+WBzLEQyXRRYYD4l9Hxm7zkdmwDkSxAMDCrRu2Mm2o82f9aGGay/27G
-qphSsl/MoSu3m4zIvs2Y7Moy8CoRQkT9Tj0CH3h8O12bhr92SdmAhIvDkV1Et0at
-/llM9YvHVj/EI2w4WM6HmpOTamcpdpa6G64/HD4Bs0V27RC4aXcyr4efyOZOuZvy
-ZmeONtLBAoGBAPEyCWNbkC5UmoAhGUIHjOuGsPJw7+e7W40ICUgFkQFbypVq6VjY
-gkFO42zrRitYaTl8nJ56zvwwZ3piZjTXphLa/76lYmV9xcxxYEW7frdCI5behJaU
-RggtijqKn43u27S6/nc9NCGam9EiMTP/GXC/Ighqn7t4BWllzEWPb4/ZAoGBAMdq
-GRQnsSkm7ZLjPgNLHOX+VZTa2hqi5L5JKCZae/OWANf1B2IO62djwbdERktrxJOc
-KGXyp1CVK8188zwKO6kFxPYKh8Gz7XuwOIffwO3vmR1sB44q+QpNHJNgGADg6fcR
-8Zc4woKZWs7iGpeeFuFBZ1DbDvPo8CToM39p7kq5AoGBAMtto2Nst7eL3d+RiwcY
-7S89JALnZEBz0mypyYI4R6v4qm3JhVRND9dbXQ/hhAZNBDrbMhGsjOVBQhWD5qZM
-+CJRGYDHZq0pHmonecZ2tBKGsxOtS/Dg0AxXtI1Zm+cO/bl6OeOB+HUbPK5wA0XS
-s7dXTbIBlAV+3jmeBWLp7nNJAoGBAIWwwsl5ZtOBDqt4f92zYNdssLGQG8LZzGMq
-Jqm35fvDaCNgWafK+tUg0wFr23i68lpHyem3SabDq08jYuqwrZi+jnKpUqRxXVic
-Jvoo725VQKCyCUqt0rKuSecf+Fe2cgS7We2ZFwZ5i6DBgzR8vzgbIgnaIucxFraX
-mdblDOW5AoGAULiz9vvXQoCmsofwMyg9ojgqbqN6QW0w1QcanglyCI9R7+Mqd/qG
-LmlhMQ+stNSrO5gxEi/6get6B9qbIbt3zwz/sj+7aNB0Z5V9nNifIe7bIUPTq461
-fZA/lKszeh2QwLLbhvkv8IFGgNZo2Pg812ADhqQqwMv1xeYFpXQ6i/g=
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIkDTZd8SFWZKl25ZKg5oJmOGTn5zTXbaCpoaU881NHMoAoGCCqGSM49
+AwEHoUQDQgAEV01OXJUN3NJYa/DGnSi21H+EqVX4mjOGwJTAVXmWHkZky4PEm/yU
+OM5Rumyd+WM88mauG+eFRjZkIk0IOnBP1A==
+-----END EC PRIVATE KEY-----
diff --git a/regr-tests/prep-pki.sh b/regr-tests/prep-pki.sh
new file mode 100755
index 0000000..19cceb8
--- /dev/null
+++ b/regr-tests/prep-pki.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set +eu
+
+# --- Revised 3-Clause BSD License ---
+# Copyright Semtech Corporation 2022. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+#     * Neither the name of the Semtech corporation nor the names of its
+#       contributors may be used to endorse or promote products derived from this
+#       software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL SEMTECH CORPORATION. BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# prep-pki.sh <pkidir> - Prepare the environment for regression tests.
+
+
+function ecdsaKey() {
+    # Key not password protected for simplicity
+    openssl ecparam -name prime256v1 -genkey | openssl ec -out $1
+}
+
+function rootCA() {
+    mkdir -p ca
+    ecdsaKey $2/"${1,,}"-ca.key
+    openssl req -new -key $2/"${1,,}"-ca.key -out $2/"${1,,}"-ca.csr -subj "/OU=Example/O=BasicStation/C=CH/CN=$1 Root CA"
+    openssl x509 -req -set_serial 1 -days 365 -in $2/"${1,,}"-ca.csr -signkey $2/"${1,,}"-ca.key -out $2/"${1,,}"-ca.crt
+    rm $2/"${1,,}"-ca.csr
+}
+
+function cert() {
+    # $1 -> name, $2 -> signing CA, $3 -> target dir, $4 ext
+    mkdir -p $3
+    ecdsaKey $3/$1.key
+    openssl req -new -key $3/$1.key -out $3/$1.csr -subj "/OU=Example/O=BasicStation/C=CH/CN=$1"
+    openssl x509 -req -set_serial 1 -days 365 -CA $2-ca.crt -CAkey $2-ca.key -in $3/$1.csr -out $3/$1.crt -extfile <(printf "$4")
+    openssl verify -CAfile $2-ca.crt $3/$1.crt && rm $3/$1.csr
+    cp $2-ca.crt $3/$1.trust
+}
+
+cd $1
+
+echo "== Build PKI =="
+
+SAN_LOCALHOST="subjectAltName=DNS:localhost"
+
+# CUPS CA
+rootCA CUPS ca                                      #  CUPS CA
+cert cups-0        ca/cups cups-0 $SAN_LOCALHOST  #   +- cups-0         server auth
+cert cups-router-1 ca/cups cups-0                 #   +- cups-router-1  client auth
+cert cups-router-2 ca/cups cups-0                 #   +- cups-router-2  client auth
+for I in cups-0 cups-router-1 cups-router-2
+do
+    cp cups-0/$I.trust $I.ca
+    cp cups-0/$I.crt .
+    cp cups-0/$I.key .
+done
+
+# TC CA
+rootCA TC ca                                        #  TC CA
+cert muxs-0      ca/tc tc-0 $SAN_LOCALHOST          #   +- muxs-0         server auth
+cert infos-0     ca/tc tc-0 $SAN_LOCALHOST          #   +- infos-0        server auth
+cert tc-router-1 ca/tc tc-0                         #   +- tc-router-1    client auth
+cert tc-router-2 ca/tc tc-0                         #   +- tc-router-2    client auth
+for I in infos-0 muxs-0 tc-router-1 tc-router-2
+do
+    cp tc-0/$I.trust $I.ca
+    cp tc-0/$I.crt .
+    cp tc-0/$I.key .
+done
+
+rm -r ca cups-0 tc-0
-- 
2.51.1