Merge #2562 #2593

2562: ADP-744 Swagger spec update r=rvl a=reactormonk # Issue Number ADP-744 # Overview The `inspectAddress` passes along a `Value` struct directly from `addresses`, so there isn't much work to be done here. See IntersectMBO/cardano-addresses#110 for the actual implementation - [x] Updates OpenAPI spec - [x] Adds integration test, testing that bech32 fields are present and correct (the rest of the tests are in cardano-addresses). - [x] Updates cardano-addresses revision in `stack.yaml` and `cabal.project` to a master branch rev with IntersectMBO/cardano-addresses#115 merged. - [x] Update for cardano-addresses API changes since last release. # Comments - May be worth considering typing `inspectAddress` in a more fine-grained manner ⇒ ADP-847. - Requires IntersectMBO/cardano-addresses#115 to be merged first. 2593: Regenerate TLS certs for unit tests r=Anviking a=rvl ### Issue Number ADP-852 ### Overview - Generate new certificates for the TLS tests, because the current ones have expired. - Add a script to regenerate those files. ### Comments Using cardano-sl-x509 turned out to be harder than expected ... doh ... should have just used openssl. Co-authored-by: Simon Hafner <[email protected]> Co-authored-by: Rodney Lorrimar <[email protected]>
cardano-foundation · Apr 1, 2021 · 20dc1dd · 20dc1dd
3 parents af82524 + e768806 + e14b037
commit 20dc1dd
Show file tree

Hide file tree

Showing 40 changed files with 557 additions and 468 deletions.
diff --git a/cabal.project b/cabal.project
@@ -22,7 +22,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-addresses
-    tag: 05bd6d0b877d8fc440be83142935fa1e7a915916
+    tag: 55f174b32095e4264e0c75344caf34f4207a4e58
     subdir: command-line
             core
 

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs
@@ -345,6 +345,17 @@ spec = describe "SHELLEY_ADDRESSES" $ do
         r <- request @Aeson.Value ctx (Link.inspectAddress str) Default Empty
         expectResponseCode HTTP.status400 r
 
+    it "ADDRESS_INSPECT_03 - Address inspect bech32" $ \ctx -> do
+        let str = "addr_test1qzamu40sglnsrylzv9jylekjmzgaqsg5v5z9u6yk3jpnnxjwck77fqu8deuumsvnazjnjhwasc2eetfqpa2pvygts78ssd5388"
+        r <- request @Aeson.Value ctx (Link.inspectAddress str) Default Empty
+        verify r
+            [ expectResponseCode HTTP.status200
+            , expectField (Aeson.key "spending_key_hash_bech32" . Aeson._String)
+                (`shouldBe` "addr_test1hwl9tuz8uuqe8cnpv387d5kcj8gyz9r9q30x395vsvue5una0f4")
+            , expectField (Aeson.key "stake_key_hash_bech32" . Aeson._String)
+                (`shouldBe` "stake_vkh1fmzmmeyrsah8nnwpj0522w2amkrpt89dyq84g9s3pwrc7dqjnfu")
+            ]
+
     -- Generating golden test data for enterprise addresses - script credential:
     --- $ cardano-address script hash "$(cat script.txt)" \
     --- | cardano-address address payment --from-script --network-tag mainnet

diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal
@@ -251,6 +251,7 @@ test-suite unit
     , cardano-wallet-core
     , cardano-wallet-launcher
     , cardano-wallet-test-utils
+    , cardano-sl-x509
     , cardano-slotting
     , cborg
     , connection

diff --git a/lib/core/src/Cardano/Wallet/Primitive/AddressDiscovery/Script.hs b/lib/core/src/Cardano/Wallet/Primitive/AddressDiscovery/Script.hs
@@ -71,7 +71,7 @@ import Data.Either.Combinators
 import Data.Kind
     ( Type )
 import Data.Maybe
-    ( fromMaybe, isJust )
+    ( fromJust, fromMaybe, isJust )
 import Data.Type.Equality
     ( (:~:) (..), testEquality )
 import Type.Reflection
@@ -107,7 +107,7 @@ replaceCosignersWithVerKeys role (ScriptTemplate xpubs scriptTemplate) ix =
         ActiveFromSlot s     -> ActiveFromSlot s
         ActiveUntilSlot s    -> ActiveUntilSlot s
     convertIndex :: Index 'Soft 'ScriptK -> CA.Index 'CA.Soft 'CA.PaymentK
-    convertIndex = toEnum .fromEnum
+    convertIndex = fromJust . CA.indexFromWord32 . fromIntegral . fromEnum
     toKeyHash :: Cosigner -> KeyHash
     toKeyHash c =
         let (Just accXPub) =

diff --git a/lib/core/test/data/PKIs/1/ca.crt b/lib/core/test/data/PKIs/1/ca.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDSDCCAjCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBDMRgwFgYDVQQKDA9JbnB1
-dCBPdXRwdXQgSEsxJzAlBgNVBAMMHkNhcmRhbm8gU0wgU2VsZi1TaWduZWQgUm9v
-dCBDQTAeFw0yMDAzMzAxMjI5MjBaFw0zMDAzMjgxMjMwMjBaMEMxGDAWBgNVBAoM
-D0lucHV0IE91dHB1dCBISzEnMCUGA1UEAwweQ2FyZGFubyBTTCBTZWxmLVNpZ25l
-ZCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsGSVdbL9
-aTyl5ujdKjqVgXsBx8Mw7fA5nLTS2G9CMeqCMxuZErCxcWyxyfBdSQDHJszVTXY6
-TQhsDBa4KD97KlkKEtgRtugsw3+dO8tiYgcm78L+YlWDCBVeXc/tcn5247DS/qxg
-Fj0wK0AzYnOGrZcoZi3Gqt9WST0xirSlzPi9iuoqimgUXaE16D3/tuBq3l+1FXFv
-hhoNsD9XqLeOrn/1NSEi5hFSGiXM4ujtYWgOnISZTPzHZismpzHUY2Onr06n7gF5
-qOCI09kZt9gvu0mEHrgY5ZLrPEUnSg+bmo5tA0TisymfdsIzLreN2YQfKrv6l0l5
-3pXg4D4AxpXQZQIDAQABo0cwRTAPBgNVHQ8BAf8EBQMDBwYAMBIGA1UdEwEB/wQI
-MAYBAf8CAQAwDQYDVR0OBAYEBGwLqOgwDwYDVR0jBAgwBoAEbAuo6DANBgkqhkiG
-9w0BAQsFAAOCAQEAcw4f2GrJSQPe7ounqTkBOv/SuBaJKk9apoCCoYlm/cdvoflo
-c1feU2k8iNUq3EAMVldPYiPDH7JYlv75gVOIYjOyJza8/60WtHf9tJX+eFrYmtyN
-8dokmRnOXFldyt14FmMrZG/80d23Ah6I0mHinD7sW2WCX+cSvmQTZ5yGCrtx0r6V
-Ui/b5CfH530HB2mIhwH/jg5xbRhY8YLSJghLslXEq1eyqmOkD2Ol62worCf8Xoz+
-xvRtfZmn9xj4GPI7Mzj6YlZs6GdsEVuLO4TmjbQVYDskQ5ChiDzynG8xz4YnHVl2
-oOy68wMNt3onWUlLsQNr3iUubPtqfGbaXskS7A==
+MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADBHMRgwFgYDVQQKDA9JbnB1
+dCBPdXRwdXQgSEsxKzApBgNVBAMMImNhcmRhbm8td2FsbGV0IFNlbGYtU2lnbmVk
+IFJvb3QgQ0EwHhcNMjEwNDAxMDYyODU2WhcNMzEwMzMwMDYyOTU2WjBHMRgwFgYD
+VQQKDA9JbnB1dCBPdXRwdXQgSEsxKzApBgNVBAMMImNhcmRhbm8td2FsbGV0IFNl
+bGYtU2lnbmVkIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDMCvwbnvUsy0Sq9b1z+I26n7B2EAJ+IcvvWmAPmr8hhhJeRGvUJpGgiJRpWhTv
+bpxojsx2wIFyvroVyE79As9jfokVizNHzegXcIiQHuu9ae+MmawVtjjNnLCYxWiR
+AjmxI9HkYLKs5g2HUOc567bFHUwQjkAd8dyjbJc0qsQuxyJoH9moMHjMl/bLLbxF
+ejojWxZ+MU3ZvPjoEr9poJVuFJ2O9uxwevRXDgD4A732l0hecCrvXUqATzrTOdYF
+BdVlwDZBITBk263BxWZRVbLvfsg2xwODWgMqW2+xDcno8K5GuxnRJ2TP5y0R4mF2
+Y3MM3ObHl/62Q81sHhaPLJqpAgMBAAGjRzBFMA8GA1UdDwEB/wQFAwMHBgAwEgYD
+VR0TAQH/BAgwBgEB/wIBADANBgNVHQ4EBgQEmjQ1nDAPBgNVHSMECDAGgASaNDWc
+MA0GCSqGSIb3DQEBCwUAA4IBAQCa0UiobqDxG4ANblPMLEg6EFu5CC8GsAeX6Kgd
+O1K6TQF2q+NfmrHERaS1DKdBpDfF5O+/q3D9M6x2q7I8kuMFBbUYCVfhR6V6/ORK
+4f8Vw05QNb5USXewt0MYXdY/ICJPmmdTjKmuUI45Bj00M0paps79zt1z7cj5k/jN
+GTE4mLWrusmUxw14nLSM7z516GSPBr52b2V9pGZuzTbD4ZfzQhBrBN1yUO+dx4Rf
+A6yXxOBtUfRBkaugFUwSwNEeaWFgXURkYU5n7mW5wIFyCpuCSZCxFigR6jlzeXl3
+oDs7L/5YC+GT5+IgJ+akGQIp7FQkzk4V3+7IVFSeBxZ0konl
 -----END CERTIFICATE-----
diff --git a/lib/core/test/data/PKIs/1/client.crt b/lib/core/test/data/PKIs/1/client.crt
diff --git a/lib/core/test/data/PKIs/1/client.key b/lib/core/test/data/PKIs/1/client.key
diff --git a/lib/core/test/data/PKIs/1/client.pem b/lib/core/test/data/PKIs/1/client.pem
diff --git a/lib/core/test/data/PKIs/1/client/client.crt b/lib/core/test/data/PKIs/1/client/client.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVjCCAj6gAwIBAgIBAzANBgkqhkiG9w0BAQsFADBHMRgwFgYDVQQKDA9JbnB1
+dCBPdXRwdXQgSEsxKzApBgNVBAMMImNhcmRhbm8td2FsbGV0IFNlbGYtU2lnbmVk
+IFJvb3QgQ0EwHhcNMjEwNDAxMDYyODU1WhcNMjIwNDAxMDYyOTU1WjA+MRgwFgYD
+VQQKDA9JbnB1dCBPdXRwdXQgSEsxIjAgBgNVBAMMGWNhcmRhbm8td2FsbGV0IFRl
+c3QgU3VpdGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfRk/SNmYW
+5f6jZfqwilHWpYCTbrmO5oLYhEmv+oxRAaqUPcsBbxpNXAfOUau8tpjfmdWY6N8C
+0JPVd3X2Fqu5m2u26fPKCZkbZHxJoIKwaAFTIDYXAY7UeNf623oTqGyjb13sTvcE
+rNlwOe5Ghb8OBRnzVYwwZOVz65H8065iQwv/U1OzvawChWKHRt/8FsKerOkG5RHc
+N7lzIz2iscVDwc1LeNRlAvdCSBsvGsTIU6cn6lK11yty1HaAWVu4O8A7xCTZTaK7
+7wpjvwCeAOBJPwYzTA9sGBvVPTWlD6GeZVDcPXpCcG5rp+3AhluZ1HppHpTf1FPS
+2X3c+arNg+oHAgMBAAGjVjBUMA8GA1UdDwEB/wQFAwMHoAAwEwYDVR0lBAwwCgYI
+KwYBBQUHAwIwDAYDVR0TBAUwAwEBADANBgNVHQ4EBgQEUbVogTAPBgNVHSMECDAG
+gASaNDWcMA0GCSqGSIb3DQEBCwUAA4IBAQCcnZVyujIOjH2Shvslj5XJ4+8LO0aM
+CuzHBZY5e2CH8qOdW6tTBF7yGlwL8+vUDwpvCkeXzn8sVF6nsEQhmM/fgwtKc7Eq
+PtaFiEUHdVFlKl97bPA+cPqEMPCJyx3upN4YV1undZ7kZdcQdmBW0jxSHyAGOJVa
+pi8GDSWyY2sbn8WOebSXLhPHqxjGTwMpFK7kTD0BZx4I0C1OawRBzrJAd1SFNJq+
+LJpI3TEjzUYy4SC4ziR0AgDlmyLne8aAbYWF6KG80Y3wDhf8XhCCHfZKOezjr7fz
+pHqgER2c/vi/gkUpZ7mIgYPApcBXuUlrRWFv9vGjTzLmIbQGitl49zFS
+-----END CERTIFICATE-----
diff --git a/lib/core/test/data/PKIs/1/client/client.key b/lib/core/test/data/PKIs/1/client/client.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAn0ZP0jZmFuX+o2X6sIpR1qWAk265juaC2IRJr/qMUQGqlD3L
+AW8aTVwHzlGrvLaY35nVmOjfAtCT1Xd19haruZtrtunzygmZG2R8SaCCsGgBUyA2
+FwGO1HjX+tt6E6hso29d7E73BKzZcDnuRoW/DgUZ81WMMGTlc+uR/NOuYkML/1NT
+s72sAoVih0bf/BbCnqzpBuUR3De5cyM9orHFQ8HNS3jUZQL3QkgbLxrEyFOnJ+pS
+tdcrctR2gFlbuDvAO8Qk2U2iu+8KY78AngDgST8GM0wPbBgb1T01pQ+hnmVQ3D16
+QnBua6ftwIZbmdR6aR6U39RT0tl93PmqzYPqBwIDAQABAoIBAQCao9uwD50DMn8P
+Cl5htYpLyxiRDHog4nG74oTg1XQS2nlRwMUvOT3iSi5SBT2m1eqLfoLCGaccxoIi
+SgA/1Dca2Gm2iGNoj/UVgXSiz7LTr8dJfAbIQ3z3kfSw3RMjruz7qY8ZdnmjEmdy
+7OwJkKW06QMPHMol2nBlIhz1yliPkV0iHXIUVW9euUmq+Pi2jlDKwImAmsVXugQX
+Iop33mWROBk2lqkueqykNyq2htK4yopk+AjoIm6m005Qd6k0xx0+GIv8YAomOctq
+GVGK+bXCgI106boqOCbL8act2bXtJZhE6oqdufwb2ycOObe7OoJCtbjUKxZET+mX
+LBhfRAvhAoGBAMkK6lIJGH/iLa55mMVqMz5cyfVRAvm8IIPP49Szhwmq+adxll9e
+fUGBrGSmC2l8jrERZxzLvoX6qRkBoG6auVsFN2gAmCxgF9wCc7L5/L2GSeMX/blB
+3vHr8cKpt5FGHKsNU1aNAU04ozFSEJjhykX1f4aTT9nJPvBJOBObli+5AoGBAMrQ
+cq16C9KwSsuOZ93zBa099mhO2K4WGXaZxC/mHHHHktywfFsUM7QRK7fEiq47panh
+nvzZDGFbzjrvpbZjng0ZTS+aLeJqFUcRNEaM7wbdCPriX0MaWrKQoNmyl4L0vgIu
+JFNkLY0cnrXog7i0ieWr28bYo9DvLaCw+4DUCke/AoGBAJgaEQP167o9NdCOIL4j
+RhfFfeqC2xx0b6kqLLXtCZqP54f+kQUgaOWZpQMU+Qda/F4My5VmtIOLDEpmB6oG
+l3u8q5mc8YSJQyPqGvzq04PUSKxup0B1DKa9mtBrNP3NLL1hPI776WMyGY2kB/iS
+w0VAorX/V+dusZZ73tg+21bJAoGAURefgrV13LwYa+N4rEnrTyWjTHmaMaEsdTtu
+Miiz3tqJYiw+zLv7IFhtPoEbYib/SjmoNDkkthjbEL2ZaJ/UJjCjqBDhn9ICx/Od
+D0hymi/u00GIDXCQKy2g4uqBoh7xijWg2KcJf46d9uYNJOEq8eYRbiRY+8VmXQXm
+yc/+fEkCgYA0/Bavf1W8UoQHJsXa5ixozzuM+tAD6cN8CvVxjakowKS95LjmpKbx
+wDse1EWjsL+rqUfiZni7KI1qLagxKCakI6wHmBqvwHVX2X1hOJ1JHL5RXmttZ+US
+tlTx0N5L84mMkLQFESEwU60zEjPF+bLhPgJBj3Xepwf8VVZbNgOaEg==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/core/test/data/PKIs/1/client/client.pem b/lib/core/test/data/PKIs/1/client/client.pem
@@ -0,0 +1,47 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAn0ZP0jZmFuX+o2X6sIpR1qWAk265juaC2IRJr/qMUQGqlD3L
+AW8aTVwHzlGrvLaY35nVmOjfAtCT1Xd19haruZtrtunzygmZG2R8SaCCsGgBUyA2
+FwGO1HjX+tt6E6hso29d7E73BKzZcDnuRoW/DgUZ81WMMGTlc+uR/NOuYkML/1NT
+s72sAoVih0bf/BbCnqzpBuUR3De5cyM9orHFQ8HNS3jUZQL3QkgbLxrEyFOnJ+pS
+tdcrctR2gFlbuDvAO8Qk2U2iu+8KY78AngDgST8GM0wPbBgb1T01pQ+hnmVQ3D16
+QnBua6ftwIZbmdR6aR6U39RT0tl93PmqzYPqBwIDAQABAoIBAQCao9uwD50DMn8P
+Cl5htYpLyxiRDHog4nG74oTg1XQS2nlRwMUvOT3iSi5SBT2m1eqLfoLCGaccxoIi
+SgA/1Dca2Gm2iGNoj/UVgXSiz7LTr8dJfAbIQ3z3kfSw3RMjruz7qY8ZdnmjEmdy
+7OwJkKW06QMPHMol2nBlIhz1yliPkV0iHXIUVW9euUmq+Pi2jlDKwImAmsVXugQX
+Iop33mWROBk2lqkueqykNyq2htK4yopk+AjoIm6m005Qd6k0xx0+GIv8YAomOctq
+GVGK+bXCgI106boqOCbL8act2bXtJZhE6oqdufwb2ycOObe7OoJCtbjUKxZET+mX
+LBhfRAvhAoGBAMkK6lIJGH/iLa55mMVqMz5cyfVRAvm8IIPP49Szhwmq+adxll9e
+fUGBrGSmC2l8jrERZxzLvoX6qRkBoG6auVsFN2gAmCxgF9wCc7L5/L2GSeMX/blB
+3vHr8cKpt5FGHKsNU1aNAU04ozFSEJjhykX1f4aTT9nJPvBJOBObli+5AoGBAMrQ
+cq16C9KwSsuOZ93zBa099mhO2K4WGXaZxC/mHHHHktywfFsUM7QRK7fEiq47panh
+nvzZDGFbzjrvpbZjng0ZTS+aLeJqFUcRNEaM7wbdCPriX0MaWrKQoNmyl4L0vgIu
+JFNkLY0cnrXog7i0ieWr28bYo9DvLaCw+4DUCke/AoGBAJgaEQP167o9NdCOIL4j
+RhfFfeqC2xx0b6kqLLXtCZqP54f+kQUgaOWZpQMU+Qda/F4My5VmtIOLDEpmB6oG
+l3u8q5mc8YSJQyPqGvzq04PUSKxup0B1DKa9mtBrNP3NLL1hPI776WMyGY2kB/iS
+w0VAorX/V+dusZZ73tg+21bJAoGAURefgrV13LwYa+N4rEnrTyWjTHmaMaEsdTtu
+Miiz3tqJYiw+zLv7IFhtPoEbYib/SjmoNDkkthjbEL2ZaJ/UJjCjqBDhn9ICx/Od
+D0hymi/u00GIDXCQKy2g4uqBoh7xijWg2KcJf46d9uYNJOEq8eYRbiRY+8VmXQXm
+yc/+fEkCgYA0/Bavf1W8UoQHJsXa5ixozzuM+tAD6cN8CvVxjakowKS95LjmpKbx
+wDse1EWjsL+rqUfiZni7KI1qLagxKCakI6wHmBqvwHVX2X1hOJ1JHL5RXmttZ+US
+tlTx0N5L84mMkLQFESEwU60zEjPF+bLhPgJBj3Xepwf8VVZbNgOaEg==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDVjCCAj6gAwIBAgIBAzANBgkqhkiG9w0BAQsFADBHMRgwFgYDVQQKDA9JbnB1
+dCBPdXRwdXQgSEsxKzApBgNVBAMMImNhcmRhbm8td2FsbGV0IFNlbGYtU2lnbmVk
+IFJvb3QgQ0EwHhcNMjEwNDAxMDYyODU1WhcNMjIwNDAxMDYyOTU1WjA+MRgwFgYD
+VQQKDA9JbnB1dCBPdXRwdXQgSEsxIjAgBgNVBAMMGWNhcmRhbm8td2FsbGV0IFRl
+c3QgU3VpdGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfRk/SNmYW
+5f6jZfqwilHWpYCTbrmO5oLYhEmv+oxRAaqUPcsBbxpNXAfOUau8tpjfmdWY6N8C
+0JPVd3X2Fqu5m2u26fPKCZkbZHxJoIKwaAFTIDYXAY7UeNf623oTqGyjb13sTvcE
+rNlwOe5Ghb8OBRnzVYwwZOVz65H8065iQwv/U1OzvawChWKHRt/8FsKerOkG5RHc
+N7lzIz2iscVDwc1LeNRlAvdCSBsvGsTIU6cn6lK11yty1HaAWVu4O8A7xCTZTaK7
+7wpjvwCeAOBJPwYzTA9sGBvVPTWlD6GeZVDcPXpCcG5rp+3AhluZ1HppHpTf1FPS
+2X3c+arNg+oHAgMBAAGjVjBUMA8GA1UdDwEB/wQFAwMHoAAwEwYDVR0lBAwwCgYI
+KwYBBQUHAwIwDAYDVR0TBAUwAwEBADANBgNVHQ4EBgQEUbVogTAPBgNVHSMECDAG
+gASaNDWcMA0GCSqGSIb3DQEBCwUAA4IBAQCcnZVyujIOjH2Shvslj5XJ4+8LO0aM
+CuzHBZY5e2CH8qOdW6tTBF7yGlwL8+vUDwpvCkeXzn8sVF6nsEQhmM/fgwtKc7Eq
+PtaFiEUHdVFlKl97bPA+cPqEMPCJyx3upN4YV1undZ7kZdcQdmBW0jxSHyAGOJVa
+pi8GDSWyY2sbn8WOebSXLhPHqxjGTwMpFK7kTD0BZx4I0C1OawRBzrJAd1SFNJq+
+LJpI3TEjzUYy4SC4ziR0AgDlmyLne8aAbYWF6KG80Y3wDhf8XhCCHfZKOezjr7fz
+pHqgER2c/vi/gkUpZ7mIgYPApcBXuUlrRWFv9vGjTzLmIbQGitl49zFS
+-----END CERTIFICATE-----
diff --git a/lib/core/test/data/PKIs/1/server.crt b/lib/core/test/data/PKIs/1/server.crt
diff --git a/lib/core/test/data/PKIs/1/server.key b/lib/core/test/data/PKIs/1/server.key