interop: fix tls certs and tf script (#2048)

Author: LucioFranco

interop/data/ca.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRzCCAi+gAwIBAgIRAO7dzPqhReVW2U6D1V1DTYAwDQYJKoZIhvcNAQELBQAw
-PTEOMAwGA1UEChMFVG9raW8xEDAOBgNVBAsTB1Rlc3RpbmcxGTAXBgNVBAMTEFRv
-bmljIFRlc3RpbmcgQ0EwHhcNMTkxMTA5MTY0NzU0WhcNMjkxMTA2MTY0NzU0WjA9
+MIIDRjCCAi6gAwIBAgIQQS24If9oGkeiIDhCX3LptTANBgkqhkiG9w0BAQsFADA9
 MQ4wDAYDVQQKEwVUb2tpbzEQMA4GA1UECxMHVGVzdGluZzEZMBcGA1UEAxMQVG9u
-aWMgVGVzdGluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+A
-e+Y3wDdOm7yUi6xHINw1QE0k1D51U+DAMOLcUq17FYh3fp+OOaqq4znnEx8WkKVl
-FuoW4xzIrv2ywn0hFADCxaVpjMuCxj313D7LMZExa98TuFF3Jg2GYScBRQKjfyRv
-CV+cSHAvzEstd5ckdiz985Zqnepiy7R9k2CstO45ULG4UoVha+VgmYJ5qXqBXbso
-LbDXzrjjQFSmbw1yh9lQvzsk0UyU5Hvi0Otka4LZJsNaNFWkltl8v37QWG6sH8+f
-Ur7fELIDmbScGSiqvEm0EZLZHqLU669NvUoFtTKNfKghT83DW9kErzdg5EcVFQom
-Ov8cIW9MkBwDJXe6D88CAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFE5N36NK1qLWGDxSJP3IF9H2oLO/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAm27Wdq6+0IxvattJW0j7lnh9AC7aMQEbUQPYM8iO6WVhXshaN
-d7YbLDGwRtATzLeA/0laovEL5pc/1NnMsqG4DspD3glXcASUiu5TrzPvBrAWByQn
-8C9tGUbyP1yJMo42Mzs0hIDsaUsucynZcdxAErjJjKB9Ps3KeaA6LUr/igN0649S
-qQ6bHZdNEIhjyCY7TDJArjPTgdSYjx13XkVbZ1cN/ssZI7Ag8WByhVEHeoE13fqw
-ue5oTNat0qNFP0Yo8XB0whPhN2wbCbHoc5khXJiBrMEjAAgJUiWRy3ITG88SIak+
-1dtqgxS2T0nmdRlXBYNNhYKdgWYJq1PwDp9a
+aWMgVGVzdGluZyBDQTAeFw0yNDExMTMxOTQ0MzBaFw0zNDExMTExOTQ0MzBaMD0x
+DjAMBgNVBAoTBVRva2lvMRAwDgYDVQQLEwdUZXN0aW5nMRkwFwYDVQQDExBUb25p
+YyBUZXN0aW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuRMq
+OMDsXvkEc/ArFxHhNNd1qIRhgPElLR/de091WVEKGGQI7OEJLE5/dfD2RMe0PdvZ
+tEhURM/SUkreYeJhC7AFbAVM6cDC7Lj+GB1v63EbpFTDkkrJ5+GN7DtID/FNYg4M
+sBlHCMys2ZWByAy6/fBZ4PKyJbMX4gtySLAyCTqI/BV1TC/7tgxiNrSNv/MZiqqO
+FOdAfpkdb/mGWkxOB+JYWT8QBjIWcWaoWJcwmlY4ZC6U5aaNxO3VKDdGyghKkPS7
+nDAMe5H3Cl/rR1TKY3A9TVcE4qQ514647NQpCoOJZ39PbXJy+S4v3qI61IvFBPFh
+C3tgZABh8h9dO7ddGQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQU6k4lLdVI7YCNA9eQBb8hO3nIFVQwDQYJKoZIhvcN
+AQELBQADggEBADhJOxK2tPlai1pSwT0ud7oXXfAQpI1PZ9FxWR9qx1UsTLb3sfTW
++20RQdguGXTby5wkHIiVJ6vAEDRd8X9oOf8vk2zvnmWLgiDdOh3e3OkOme6Qs+V9
+mXIA8JZnYGaqmAPcmZU5uY2lrf0oXURqb9ZNL5DCc1yJ1rVC3jCQLZZ1v6GGRNB5
+YhTWlQYUcu2nw8fN1scrV9322gU5siJzrNrjO9yabIYZyMpwcNwarvoxcVT8zLM5
+ZLUTjG2Yr8PJ13Bn2dyw8mDuL0ixXU34vQNIHBk1UmbzyWL9mDfu9RfpIDIDkEzK
+sO/HXgh4vzETaIhkEuW9porYX5d1QyVED8I=
 -----END CERTIFICATE-----

interop/data/cert-generator/ca.tf

@@ -4,7 +4,6 @@ resource "tls_private_key" "root" {
 }
 
 resource "tls_self_signed_cert" "root" {
-  key_algorithm = tls_private_key.root.algorithm
   private_key_pem = tls_private_key.root.private_key_pem
 
   validity_period_hours = 87600
@@ -24,4 +23,4 @@ resource "tls_self_signed_cert" "root" {
 resource "local_file" "ca_cert" {
   filename = "../ca.pem"
   content = tls_self_signed_cert.root.cert_pem
-}
+}

interop/data/cert-generator/server_certs.tf

@@ -4,7 +4,6 @@ resource "tls_private_key" "server" {
 }
 
 resource "tls_cert_request" "server" {
-  key_algorithm = tls_private_key.server.algorithm
   private_key_pem = tls_private_key.server.private_key_pem
 
   subject {
@@ -19,7 +18,6 @@ resource "tls_cert_request" "server" {
 resource "tls_locally_signed_cert" "server" {
   cert_request_pem = tls_cert_request.server.cert_request_pem
 
-  ca_key_algorithm = tls_private_key.root.algorithm
   ca_private_key_pem = tls_private_key.root.private_key_pem
   ca_cert_pem = tls_self_signed_cert.root.cert_pem
 

interop/data/server1.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

interop/data/server1.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----