From 1c2e115975a416e0c2a324cd3b12a4940a71fff7 Mon Sep 17 00:00:00 2001 From: Klaus Fischer <klaus.fischer@eloware.com> Date: Fri, 23 Jun 2023 07:02:59 +0200 Subject: [PATCH] chore: change system layout --- JwkGenerator/KeyGenerator.cs | 33 +++---------------- JwkGenerator/Program.cs | 2 +- Tests/EncryptionTests/CertificateTests.cs | 2 +- .../Generator2/privateKey_decryption.json | 1 - .../Generator2/privateKey_signing.json | 1 - .../Generator2/publicKey_encryption.json | 1 - .../publicKey_signature_verification.json | 1 - .../Generator2/set-public-keys.json | 1 - Tests/EncryptionTests/EncryptionTests.csproj | 21 ++++++++++-- 9 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 Tests/EncryptionTests/Certificates/Generator2/privateKey_decryption.json delete mode 100644 Tests/EncryptionTests/Certificates/Generator2/privateKey_signing.json delete mode 100644 Tests/EncryptionTests/Certificates/Generator2/publicKey_encryption.json delete mode 100644 Tests/EncryptionTests/Certificates/Generator2/publicKey_signature_verification.json delete mode 100644 Tests/EncryptionTests/Certificates/Generator2/set-public-keys.json diff --git a/JwkGenerator/KeyGenerator.cs b/JwkGenerator/KeyGenerator.cs index 54ec320e..bcc0d74f 100644 --- a/JwkGenerator/KeyGenerator.cs +++ b/JwkGenerator/KeyGenerator.cs @@ -63,8 +63,8 @@ namespace JwkGenerator { var decryptionJwk = new JsonWebKey { Kty = "RSA", - N = Base64Url.Encode(encryptionKey.ExportRSAPublicKey()), - E = Base64Url.Encode(encryptionKey.ExportRSAPublicKey()), + N = Base64Url.Encode(encryptionKey.ExportRSAPrivateKey()), + E = Base64Url.Encode(encryptionKey.ExportRSAPrivateKey()), Alg = "RSA-OAEP-256", KeyOps = { "unwrapKey" } }; @@ -72,8 +72,8 @@ namespace JwkGenerator { // Erzeuge JWKs für die Signatur- und Verifizierungsschlüssel var signingJwk = new JsonWebKey { Kty = "RSA", - N = Base64Url.Encode(signingKey.ExportRSAPublicKey()), - E = Base64Url.Encode(signingKey.ExportRSAPublicKey()), + N = Base64Url.Encode(signingKey.ExportRSAPrivateKey()), + E = Base64Url.Encode(signingKey.ExportRSAPrivateKey()), Alg = "PS512", X5c = { CertToX5c(signingCert) }, KeyOps = { "sign" } @@ -87,13 +87,6 @@ namespace JwkGenerator { KeyOps = { "verify" } }; - // Definiere Dateipfade - var keySetFile = Path.Combine(outputDirectory, "set-public-keys.json"); - var publicKeyEncryptionFile = Path.Combine(outputDirectory, "publicKey_encryption.json"); - var publicKeySigningFile = Path.Combine(outputDirectory, "publicKey_signature_verification.json"); - var privateKeyDecryptionFile = Path.Combine(outputDirectory, "privateKey_decryption.json"); - var privateKeySigningFile = Path.Combine(outputDirectory, "privateKey_signing.json"); - // Erzeuge den JSON-Serializer mit SnakeCase ContractResolver var serializerSettings = new JsonSerializerSettings { ContractResolver = new DefaultContractResolver { @@ -101,24 +94,8 @@ namespace JwkGenerator { } }; - // Schreibe das JWKS in eine Datei - var jwkSet = new JsonWebKeySet { - Keys = { encryptionJwk, signingJwk } - }; - File.WriteAllText(keySetFile, JsonConvert.SerializeObject(jwkSet, serializerSettings)); - - // Schreibe die JWKs in separate Dateien - File.WriteAllText(publicKeyEncryptionFile, JsonConvert.SerializeObject(encryptionJwk, serializerSettings)); - File.WriteAllText(publicKeySigningFile, JsonConvert.SerializeObject(signingJwk, serializerSettings)); - File.WriteAllText(privateKeyDecryptionFile, JsonConvert.SerializeObject(decryptionJwk, serializerSettings)); - File.WriteAllText(privateKeySigningFile, JsonConvert.SerializeObject(verificationJwk, serializerSettings)); - - Console.WriteLine($"Wrote JWK representation of encryption public key to {publicKeyEncryptionFile}"); - Console.WriteLine($"Wrote JWK representation of signature validation public key to {publicKeySigningFile}"); - Console.WriteLine($"Wrote JWKS of Public Keys to {keySetFile}"); - Console.WriteLine($"Wrote JWK representation of decryption private key to {privateKeyDecryptionFile}"); - Console.WriteLine($"Wrote JWK representation of signing private key to {privateKeySigningFile}"); + return (JsonConvert.SerializeObject(encryptionJwk, serializerSettings), JsonConvert.SerializeObject(signingJwk, serializerSettings), JsonConvert.SerializeObject(decryptionJwk, serializerSettings), diff --git a/JwkGenerator/Program.cs b/JwkGenerator/Program.cs index 51d74a37..10538d21 100644 --- a/JwkGenerator/Program.cs +++ b/JwkGenerator/Program.cs @@ -3,7 +3,7 @@ namespace JwkGenerator { public class Application { private static void Main(string[] args) { - var outputDirectory = "./"; + var outputDirectory = args[0]; var (encryptionJwk, decryptionJwk, signingJwk, verificationJwk) = new JwkGenerator().GenerateKeys(outputDirectory); var publicKeyEncryptionFile = Path.Combine(outputDirectory, "publicKey_encryption.json"); diff --git a/Tests/EncryptionTests/CertificateTests.cs b/Tests/EncryptionTests/CertificateTests.cs index ed032597..6f71e5c9 100644 --- a/Tests/EncryptionTests/CertificateTests.cs +++ b/Tests/EncryptionTests/CertificateTests.cs @@ -12,7 +12,7 @@ namespace SenderTest; public class CertificateTests { private List<string> _keys = null!; private ILogger _logger = null!; - string pathRoot = "./Certificates/SelfGenerated"; + string pathRoot = "./Certificates/Generator2"; [SetUp] public void SetUp() { diff --git a/Tests/EncryptionTests/Certificates/Generator2/privateKey_decryption.json b/Tests/EncryptionTests/Certificates/Generator2/privateKey_decryption.json deleted file mode 100644 index 79948958..00000000 --- a/Tests/EncryptionTests/Certificates/Generator2/privateKey_decryption.json +++ /dev/null @@ -1 +0,0 @@ -{"additional_data":{},"alg":"RSA-OAEP-256","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","k":null,"key_id":null,"key_ops":["wrapKey"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5c":["MIIFEjCCAvqgAwIBAgIIWYFkRlvrgEMwDQYJKoZIhvcNAQENBQAwSTELMAkGA1UEBhMCREUxFTATBgNVBAoTDFRlc3RiZWhvZXJkZTEjMCEGA1UEAxMaRklUIENvbm5lY3QgVGVzdHplcnRpZmlrYXQwHhcNMjMwNjIyMTIyMTA4WhcNMzMwNjIyMTIyMTA4WjBJMQswCQYDVQQGEwJERTEVMBMGA1UEChMMVGVzdGJlaG9lcmRlMSMwIQYDVQQDExpGSVQgQ29ubmVjdCBUZXN0emVydGlmaWthdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOqaqbrwbYVhY/ZLAS6+gCDVrNO5Y2KUmiDuI087+gzChhFUf7m5qVX84UO6tCsCKj63kbvu4BMW60oTJChAhCCqCuWNTOHpDQMEQNs5jUUYHX6YjJDgToeGIGwqYehbVAJaKAAqZpX7+lljsciAx8DiW6wxkNPbXFJ+4d7ln2dVTZ1LPxZjhDv0isBscN8XqgiCJHVF2NTLHQkAia0yfXOIBfoeYYmpENzfA4yn/bKEspDFNRkBB4zbKSZf3WfRnvtaiYr+HAV+mdl+y+4S+lRXfimpBh2ILSopJouXiv3HxawhwmZKYKEjxz4FqxOaMyd9YDjsqsKcCr0FiFw922IaBA8GnqfCbNJtfXlVxme0TqmSPI0BrLQ4AcHt4n8wUwG1NxwUquGY5xcDl78LBCFCRgspnvYMvwaZCYaWl/H/IQigUjE7Q2ifkLixoRrVKv/BKDga9/pQm514cT8NnkyFB6FRmT+48WUL/Rq7/MCnzzHwV9oN6Y2Byj0bWI4Ka6vobojfm24F2XNgI3iWJjYwiH2c8XPj3SfZw0Z86ivOIUSTgSDb/nXOQVXnS9nxEh53xGIL6HX+D/aWoeIlqPaGSYcJ4fDb5y4dz+XkxFm5iJEq+2DSLNedX5RQYCd3Ljgb8tLbd7gBeLIyZjbx2Wyb2XDKEPlM1f82zSFIXLB9AgMBAAEwDQYJKoZIhvcNAQENBQADggIBAHv9pALYDQ0Oomvp0yaytV96xoUjM2UmLztRTwccgIuWTfD3I5XBdriRqZJRPYnLoQbmz2aphTaqQpZ2/HzEipF7Jbueh+8bgs7Ch8vP3WXPfM3rEvB6yGkWY6TeJiR86Bo85wELbgAIzqniHpsegTfyhNo6c9XhAtY3xRclq1KbLndOusC399sjLZUYTOArXpz49D8miSnbpJXEeG6CRf00JqE9PM6OIrhH9IJx67F6Mip0AL1YiMfYfOhLIZTz4f6YDLW2yjikiCentBbexTFMLuZlUQUadrBuE1JoMtO8Mh1bz3r+zNiM219wsguVNmVc3ujl+Zhbv4aFf3eRMaK0ZCgmqpL6nF9M1df38fy2NGjlj0XcEUpdZEAHrwwrk+A6ExvZOlYTYmYnew/Au7skQsrKQ1NXhwecwFFy51EK9bImHyWJRixry0RZWAr1WD1gOxCEsHkiAF2meAFvsttIWJwQju360WiltaURoNvll6aU/92J4/gjedQSdTbVQgNs/hC48D5LJrANbticfNHXXPWHGQsNS9xOoaN7c9g8w+b88ew2cIeYmNEKcogaJubx06VKMbhcYfBb2LVuNNpH+q0bWNJ7qksitC1E+lj0G/5Bicu5UoZu4rVQSz75wKswsA1QZ+jcMbAtBBciQd0Dw2prg9Fx1YLRcOxTlrBY"],"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}} \ No newline at end of file diff --git a/Tests/EncryptionTests/Certificates/Generator2/privateKey_signing.json b/Tests/EncryptionTests/Certificates/Generator2/privateKey_signing.json deleted file mode 100644 index 77dea2f2..00000000 --- a/Tests/EncryptionTests/Certificates/Generator2/privateKey_signing.json +++ /dev/null @@ -1 +0,0 @@ -{"additional_data":{},"alg":"RSA-OAEP-256","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","k":null,"key_id":null,"key_ops":["unwrapKey"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}} \ No newline at end of file diff --git a/Tests/EncryptionTests/Certificates/Generator2/publicKey_encryption.json b/Tests/EncryptionTests/Certificates/Generator2/publicKey_encryption.json deleted file mode 100644 index 79948958..00000000 --- a/Tests/EncryptionTests/Certificates/Generator2/publicKey_encryption.json +++ /dev/null @@ -1 +0,0 @@ -{"additional_data":{},"alg":"RSA-OAEP-256","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","k":null,"key_id":null,"key_ops":["wrapKey"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5c":["MIIFEjCCAvqgAwIBAgIIWYFkRlvrgEMwDQYJKoZIhvcNAQENBQAwSTELMAkGA1UEBhMCREUxFTATBgNVBAoTDFRlc3RiZWhvZXJkZTEjMCEGA1UEAxMaRklUIENvbm5lY3QgVGVzdHplcnRpZmlrYXQwHhcNMjMwNjIyMTIyMTA4WhcNMzMwNjIyMTIyMTA4WjBJMQswCQYDVQQGEwJERTEVMBMGA1UEChMMVGVzdGJlaG9lcmRlMSMwIQYDVQQDExpGSVQgQ29ubmVjdCBUZXN0emVydGlmaWthdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOqaqbrwbYVhY/ZLAS6+gCDVrNO5Y2KUmiDuI087+gzChhFUf7m5qVX84UO6tCsCKj63kbvu4BMW60oTJChAhCCqCuWNTOHpDQMEQNs5jUUYHX6YjJDgToeGIGwqYehbVAJaKAAqZpX7+lljsciAx8DiW6wxkNPbXFJ+4d7ln2dVTZ1LPxZjhDv0isBscN8XqgiCJHVF2NTLHQkAia0yfXOIBfoeYYmpENzfA4yn/bKEspDFNRkBB4zbKSZf3WfRnvtaiYr+HAV+mdl+y+4S+lRXfimpBh2ILSopJouXiv3HxawhwmZKYKEjxz4FqxOaMyd9YDjsqsKcCr0FiFw922IaBA8GnqfCbNJtfXlVxme0TqmSPI0BrLQ4AcHt4n8wUwG1NxwUquGY5xcDl78LBCFCRgspnvYMvwaZCYaWl/H/IQigUjE7Q2ifkLixoRrVKv/BKDga9/pQm514cT8NnkyFB6FRmT+48WUL/Rq7/MCnzzHwV9oN6Y2Byj0bWI4Ka6vobojfm24F2XNgI3iWJjYwiH2c8XPj3SfZw0Z86ivOIUSTgSDb/nXOQVXnS9nxEh53xGIL6HX+D/aWoeIlqPaGSYcJ4fDb5y4dz+XkxFm5iJEq+2DSLNedX5RQYCd3Ljgb8tLbd7gBeLIyZjbx2Wyb2XDKEPlM1f82zSFIXLB9AgMBAAEwDQYJKoZIhvcNAQENBQADggIBAHv9pALYDQ0Oomvp0yaytV96xoUjM2UmLztRTwccgIuWTfD3I5XBdriRqZJRPYnLoQbmz2aphTaqQpZ2/HzEipF7Jbueh+8bgs7Ch8vP3WXPfM3rEvB6yGkWY6TeJiR86Bo85wELbgAIzqniHpsegTfyhNo6c9XhAtY3xRclq1KbLndOusC399sjLZUYTOArXpz49D8miSnbpJXEeG6CRf00JqE9PM6OIrhH9IJx67F6Mip0AL1YiMfYfOhLIZTz4f6YDLW2yjikiCentBbexTFMLuZlUQUadrBuE1JoMtO8Mh1bz3r+zNiM219wsguVNmVc3ujl+Zhbv4aFf3eRMaK0ZCgmqpL6nF9M1df38fy2NGjlj0XcEUpdZEAHrwwrk+A6ExvZOlYTYmYnew/Au7skQsrKQ1NXhwecwFFy51EK9bImHyWJRixry0RZWAr1WD1gOxCEsHkiAF2meAFvsttIWJwQju360WiltaURoNvll6aU/92J4/gjedQSdTbVQgNs/hC48D5LJrANbticfNHXXPWHGQsNS9xOoaN7c9g8w+b88ew2cIeYmNEKcogaJubx06VKMbhcYfBb2LVuNNpH+q0bWNJ7qksitC1E+lj0G/5Bicu5UoZu4rVQSz75wKswsA1QZ+jcMbAtBBciQd0Dw2prg9Fx1YLRcOxTlrBY"],"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}} \ No newline at end of file diff --git a/Tests/EncryptionTests/Certificates/Generator2/publicKey_signature_verification.json b/Tests/EncryptionTests/Certificates/Generator2/publicKey_signature_verification.json deleted file mode 100644 index 77dea2f2..00000000 --- a/Tests/EncryptionTests/Certificates/Generator2/publicKey_signature_verification.json +++ /dev/null @@ -1 +0,0 @@ -{"additional_data":{},"alg":"RSA-OAEP-256","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","k":null,"key_id":null,"key_ops":["unwrapKey"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}} \ No newline at end of file diff --git a/Tests/EncryptionTests/Certificates/Generator2/set-public-keys.json b/Tests/EncryptionTests/Certificates/Generator2/set-public-keys.json deleted file mode 100644 index 39b42fde..00000000 --- a/Tests/EncryptionTests/Certificates/Generator2/set-public-keys.json +++ /dev/null @@ -1 +0,0 @@ -{"additional_data":{},"keys":[{"additional_data":{},"alg":"RSA-OAEP-256","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","k":null,"key_id":null,"key_ops":["wrapKey"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA6pqpuvBthWFj9ksBLr6AINWs07ljYpSaIO4jTzv6DMKGEVR_ubmpVfzhQ7q0KwIqPreRu-7gExbrShMkKECEIKoK5Y1M4ekNAwRA2zmNRRgdfpiMkOBOh4YgbCph6FtUAlooACpmlfv6WWOxyIDHwOJbrDGQ09tcUn7h3uWfZ1VNnUs_FmOEO_SKwGxw3xeqCIIkdUXY1MsdCQCJrTJ9c4gF-h5hiakQ3N8DjKf9soSykMU1GQEHjNspJl_dZ9Ge-1qJiv4cBX6Z2X7L7hL6VFd-KakGHYgtKikmi5eK_cfFrCHCZkpgoSPHPgWrE5ozJ31gOOyqwpwKvQWIXD3bYhoEDwaep8Js0m19eVXGZ7ROqZI8jQGstDgBwe3ifzBTAbU3HBSq4ZjnFwOXvwsEIUJGCyme9gy_BpkJhpaX8f8hCKBSMTtDaJ-QuLGhGtUq_8EoOBr3-lCbnXhxPw2eTIUHoVGZP7jxZQv9Grv8wKfPMfBX2g3pjYHKPRtYjgprq-huiN-bbgXZc2AjeJYmNjCIfZzxc-PdJ9nDRnzqK84hRJOBINv-dc5BVedL2fESHnfEYgvodf4P9pah4iWo9oZJhwnh8NvnLh3P5eTEWbmIkSr7YNIs151flFBgJ3cuOBvy0tt3uAF4sjJmNvHZbJvZcMoQ-UzV_zbNIUhcsH0CAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5c":["MIIFEjCCAvqgAwIBAgIIWYFkRlvrgEMwDQYJKoZIhvcNAQENBQAwSTELMAkGA1UEBhMCREUxFTATBgNVBAoTDFRlc3RiZWhvZXJkZTEjMCEGA1UEAxMaRklUIENvbm5lY3QgVGVzdHplcnRpZmlrYXQwHhcNMjMwNjIyMTIyMTA4WhcNMzMwNjIyMTIyMTA4WjBJMQswCQYDVQQGEwJERTEVMBMGA1UEChMMVGVzdGJlaG9lcmRlMSMwIQYDVQQDExpGSVQgQ29ubmVjdCBUZXN0emVydGlmaWthdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOqaqbrwbYVhY/ZLAS6+gCDVrNO5Y2KUmiDuI087+gzChhFUf7m5qVX84UO6tCsCKj63kbvu4BMW60oTJChAhCCqCuWNTOHpDQMEQNs5jUUYHX6YjJDgToeGIGwqYehbVAJaKAAqZpX7+lljsciAx8DiW6wxkNPbXFJ+4d7ln2dVTZ1LPxZjhDv0isBscN8XqgiCJHVF2NTLHQkAia0yfXOIBfoeYYmpENzfA4yn/bKEspDFNRkBB4zbKSZf3WfRnvtaiYr+HAV+mdl+y+4S+lRXfimpBh2ILSopJouXiv3HxawhwmZKYKEjxz4FqxOaMyd9YDjsqsKcCr0FiFw922IaBA8GnqfCbNJtfXlVxme0TqmSPI0BrLQ4AcHt4n8wUwG1NxwUquGY5xcDl78LBCFCRgspnvYMvwaZCYaWl/H/IQigUjE7Q2ifkLixoRrVKv/BKDga9/pQm514cT8NnkyFB6FRmT+48WUL/Rq7/MCnzzHwV9oN6Y2Byj0bWI4Ka6vobojfm24F2XNgI3iWJjYwiH2c8XPj3SfZw0Z86ivOIUSTgSDb/nXOQVXnS9nxEh53xGIL6HX+D/aWoeIlqPaGSYcJ4fDb5y4dz+XkxFm5iJEq+2DSLNedX5RQYCd3Ljgb8tLbd7gBeLIyZjbx2Wyb2XDKEPlM1f82zSFIXLB9AgMBAAEwDQYJKoZIhvcNAQENBQADggIBAHv9pALYDQ0Oomvp0yaytV96xoUjM2UmLztRTwccgIuWTfD3I5XBdriRqZJRPYnLoQbmz2aphTaqQpZ2/HzEipF7Jbueh+8bgs7Ch8vP3WXPfM3rEvB6yGkWY6TeJiR86Bo85wELbgAIzqniHpsegTfyhNo6c9XhAtY3xRclq1KbLndOusC399sjLZUYTOArXpz49D8miSnbpJXEeG6CRf00JqE9PM6OIrhH9IJx67F6Mip0AL1YiMfYfOhLIZTz4f6YDLW2yjikiCentBbexTFMLuZlUQUadrBuE1JoMtO8Mh1bz3r+zNiM219wsguVNmVc3ujl+Zhbv4aFf3eRMaK0ZCgmqpL6nF9M1df38fy2NGjlj0XcEUpdZEAHrwwrk+A6ExvZOlYTYmYnew/Au7skQsrKQ1NXhwecwFFy51EK9bImHyWJRixry0RZWAr1WD1gOxCEsHkiAF2meAFvsttIWJwQju360WiltaURoNvll6aU/92J4/gjedQSdTbVQgNs/hC48D5LJrANbticfNHXXPWHGQsNS9xOoaN7c9g8w+b88ew2cIeYmNEKcogaJubx06VKMbhcYfBb2LVuNNpH+q0bWNJ7qksitC1E+lj0G/5Bicu5UoZu4rVQSz75wKswsA1QZ+jcMbAtBBciQd0Dw2prg9Fx1YLRcOxTlrBY"],"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}},{"additional_data":{},"alg":"PS512","crv":null,"d":null,"dp":null,"dq":null,"e":"MIICCgKCAgEA2kcas5Zxu7LcuStUGsL-ZVEO10Hl_AZZeSDOSft-bSXXzSoJDv9sc7DgjF9uGWDTfE_car0C6e_bvF1iVs0VEXJUIdbEGNrt818B1taHP87MvMILveIDY1Jn9zEmWG8w8u78b3L5Zre1LO1MObL9h99FTizCL9JdXKRjb8R_SKZ73rwrErrG1mYgc4EDE3Pswg-SnMQTyvxr3wSbY0qzdcXoxttOSQtrOrjEpBFi_F4-l-2fhuTu0E8pTfXCAohWwiWC6mVDPe1XfHGVxglmKGqUWRlCBassG5hQzxav4dsk7pUZ89qfgeyQitzpbff5OuOZRa5wZpR323lq2rkMLo3YTMymm0lOsxUcCtRiYIy5-MdaVddC5msTrcQXHmmE3Z9XMT0fUuLKNmD7vkFvWUt36QkRBhzGRqoGRNlEiNOWa_u-s8ipJj2tSRJEivylkhtaXAYEsBd9U-uiF4d3cOsU-csS-0YNqRInG9Ktek7erILePTZD74UEOJqn0gqel_Jxvt7ev2P99KjjFu-1NEc9gEwaFRzrocZMsjsrrQekRtBpeAq1koUiMQPgxZrN0bl270EbyDmOdLn3zbB_gOG9uyuw-bMm3MhYdcgep45BQfQcANgks3aq0HkfFEnCRa49kRYk_5-VmQkVpUvCE21DuEVa5YjaT3HzZuaZY2UCAwEAAQ","k":null,"key_id":null,"key_ops":["sign"],"kid":null,"kty":"RSA","n":"MIICCgKCAgEA2kcas5Zxu7LcuStUGsL-ZVEO10Hl_AZZeSDOSft-bSXXzSoJDv9sc7DgjF9uGWDTfE_car0C6e_bvF1iVs0VEXJUIdbEGNrt818B1taHP87MvMILveIDY1Jn9zEmWG8w8u78b3L5Zre1LO1MObL9h99FTizCL9JdXKRjb8R_SKZ73rwrErrG1mYgc4EDE3Pswg-SnMQTyvxr3wSbY0qzdcXoxttOSQtrOrjEpBFi_F4-l-2fhuTu0E8pTfXCAohWwiWC6mVDPe1XfHGVxglmKGqUWRlCBassG5hQzxav4dsk7pUZ89qfgeyQitzpbff5OuOZRa5wZpR323lq2rkMLo3YTMymm0lOsxUcCtRiYIy5-MdaVddC5msTrcQXHmmE3Z9XMT0fUuLKNmD7vkFvWUt36QkRBhzGRqoGRNlEiNOWa_u-s8ipJj2tSRJEivylkhtaXAYEsBd9U-uiF4d3cOsU-csS-0YNqRInG9Ktek7erILePTZD74UEOJqn0gqel_Jxvt7ev2P99KjjFu-1NEc9gEwaFRzrocZMsjsrrQekRtBpeAq1koUiMQPgxZrN0bl270EbyDmOdLn3zbB_gOG9uyuw-bMm3MhYdcgep45BQfQcANgks3aq0HkfFEnCRa49kRYk_5-VmQkVpUvCE21DuEVa5YjaT3HzZuaZY2UCAwEAAQ","oth":null,"p":null,"q":null,"qi":null,"use":null,"x":null,"x5c":["MIIFEjCCAvqgAwIBAgIIVJ2FZ2LEtEkwDQYJKoZIhvcNAQENBQAwSTELMAkGA1UEBhMCREUxFTATBgNVBAoTDFRlc3RiZWhvZXJkZTEjMCEGA1UEAxMaRklUIENvbm5lY3QgVGVzdHplcnRpZmlrYXQwHhcNMjMwNjIyMTIyMTA5WhcNMzMwNjIyMTIyMTA5WjBJMQswCQYDVQQGEwJERTEVMBMGA1UEChMMVGVzdGJlaG9lcmRlMSMwIQYDVQQDExpGSVQgQ29ubmVjdCBUZXN0emVydGlmaWthdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANpHGrOWcbuy3LkrVBrC/mVRDtdB5fwGWXkgzkn7fm0l180qCQ7/bHOw4Ixfbhlg03xP3Gq9Aunv27xdYlbNFRFyVCHWxBja7fNfAdbWhz/OzLzCC73iA2NSZ/cxJlhvMPLu/G9y+Wa3tSztTDmy/YffRU4swi/SXVykY2/Ef0ime968KxK6xtZmIHOBAxNz7MIPkpzEE8r8a98Em2NKs3XF6MbbTkkLazq4xKQRYvxePpftn4bk7tBPKU31wgKIVsIlguplQz3tV3xxlcYJZihqlFkZQgWrLBuYUM8Wr+HbJO6VGfPan4HskIrc6W33+TrjmUWucGaUd9t5atq5DC6N2EzMpptJTrMVHArUYmCMufjHWlXXQuZrE63EFx5phN2fVzE9H1LiyjZg+75Bb1lLd+kJEQYcxkaqBkTZRIjTlmv7vrPIqSY9rUkSRIr8pZIbWlwGBLAXfVProheHd3DrFPnLEvtGDakSJxvSrXpO3qyC3j02Q++FBDiap9IKnpfycb7e3r9j/fSo4xbvtTRHPYBMGhUc66HGTLI7K60HpEbQaXgKtZKFIjED4MWazdG5du9BG8g5jnS5982wf4DhvbsrsPmzJtzIWHXIHqeOQUH0HADYJLN2qtB5HxRJwkWuPZEWJP+flZkJFaVLwhNtQ7hFWuWI2k9x82bmmWNlAgMBAAEwDQYJKoZIhvcNAQENBQADggIBAIhFr9hNjtk0B2/iXN4PCAPz8ldtVYHB1AgFr5dBvGD3uq+XFVnzrtN+dSI6Wu7FYL52LDW4har36OCFoYSIl4JRCjR5wQ1oNX11m6PIXq5Wv9kdswQ/Mzan5MxttfM3E/dXjK5fJ5nXLeCVaN5jxdSzFnaxRkv3e4qO7QAhf8ZDQb0XqtWp/oXtNMWShcl8Yonjpz1wo0YfHzukzoT+SOVeESEGZ8MsdLjrLRN/Vzt8QSgWhNNhwPDoNIwMJrcda6Eot6ygExnG70rQiy63wzHtthzCAKgorb+ZFIL3pVINlhfN4TbfuM0ZiB4qyidUgkJuqteMPK/toYKx6N6Gs9D8AzEsaSnO3sUQRXlJ8Vx6BRQrWFss6eOqtNBIRbCKcC9FjvbQGpQco914pOqh++FM6a+OzEZMMQ3A3SgXL1yi4UAJq28pIy4ZXVxSOq4EoKns6lpfiWYbYPUhwGmASPm54eOoPOMbeakrfIs9O1y/ZWoXDulCJschpMPk8QvFd6iPDsxrutL954kPCU7ev858a8mWo039RzSUtCcE+tUuG7hFnYf9sKm28+RlWUMa4w814GCIAy+Qao7NNwZCSAZLVTsgnBDd+gBj9nyNA3ckHYzhkK6rmsHh1VPkxME6W6WOl2sVVZRtL2dg+P3KrRDqUKn9maQcQ0Ynvsi2pCO3"],"x5t":null,"x5t_s256":null,"x5u":null,"y":null,"key_size":4208,"has_private_key":false,"crypto_provider_factory":{"crypto_provider_cache":{},"custom_crypto_provider":null,"cache_signature_providers":true,"signature_provider_object_pool_cache_size":40}}],"skip_unresolved_json_web_keys":true} \ No newline at end of file diff --git a/Tests/EncryptionTests/EncryptionTests.csproj b/Tests/EncryptionTests/EncryptionTests.csproj index c5175a64..9325e700 100644 --- a/Tests/EncryptionTests/EncryptionTests.csproj +++ b/Tests/EncryptionTests/EncryptionTests.csproj @@ -69,6 +69,24 @@ <None Update="Certificates\SelfGenerated\set-public-keys.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> + <None Update="Certificates\PythonCreated\privateKey_decryption.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Update="Certificates\PythonCreated\privateKey_signing.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Update="Certificates\PythonCreated\publicKey_encryption.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Update="Certificates\PythonCreated\publicKey_signature_verification.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Update="Certificates\PythonCreated\RoutingResponse.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Update="Certificates\PythonCreated\set-public-keys.json"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> <None Update="Certificates\Generator2\privateKey_decryption.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> @@ -81,9 +99,6 @@ <None Update="Certificates\Generator2\publicKey_signature_verification.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <None Update="Certificates\Generator2\set-public-keys.json"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </None> </ItemGroup> <ItemGroup> -- GitLab