From a24f7cca8d4d8976b50c5b2bee60cf57f8cd0dfa Mon Sep 17 00:00:00 2001 From: Marius C Date: Fri, 15 Dec 2023 15:09:50 +0200 Subject: [PATCH] FEAT: Create cert file with cfg --- cert/cert.go | 96 +++++++++++++++++-------------- cert/certificate.crt | 20 +++++++ cert/cmd/cert/main.go | 12 +++- cert/private_key.pem | 27 +++++++++ client/cmd/client/certificate.crt | 20 ------- client/cmd/client/private_key.pem | 27 --------- client/factory.go | 2 +- server/cmd/server/certificate.crt | 20 ------- server/cmd/server/main.go | 23 +------- server/cmd/server/private_key.pem | 27 --------- 10 files changed, 115 insertions(+), 159 deletions(-) create mode 100644 cert/certificate.crt create mode 100644 cert/private_key.pem delete mode 100644 client/cmd/client/certificate.crt delete mode 100644 client/cmd/client/private_key.pem delete mode 100644 server/cmd/server/certificate.crt delete mode 100644 server/cmd/server/private_key.pem diff --git a/cert/cert.go b/cert/cert.go index 9870ff5..bb28212 100644 --- a/cert/cert.go +++ b/cert/cert.go @@ -10,86 +10,96 @@ import ( "math/big" "os" "time" + + logger "github.com/multiversx/mx-chain-logger-go" ) -func GenerateCert() (*tls.Certificate, error) { +var log = logger.GetOrCreate("cert") + +type CertificateCfg struct { + CertCfg CertCfg + CertFileCfg CertFileCfg +} + +type CertCfg struct { + Organization string + DNSName string + Availability int64 +} + +type CertFileCfg struct { + OutFileCert string + OutFilePk string +} + +func GenerateCert(cfg CertCfg) ([]byte, *rsa.PrivateKey, error) { pk, err := rsa.GenerateKey(rand.Reader, 2048) if err != nil { - return nil, err + return nil, nil, err + } + + serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128) + serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) + if err != nil { + return nil, nil, err } template := &x509.Certificate{ - SerialNumber: big.NewInt(1), + SerialNumber: serialNumber, Subject: pkix.Name{ - Organization: []string{"MultiversX"}, - CommonName: "Username", // Will be checked by the server + Organization: []string{cfg.Organization}, + CommonName: cfg.Organization, }, + DNSNames: []string{cfg.DNSName}, NotBefore: time.Now(), - NotAfter: time.Now().Add(time.Hour), + NotAfter: time.Now().Add(time.Duration(cfg.Availability) * time.Hour), KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, - ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}, + ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, } cert, err := x509.CreateCertificate(rand.Reader, template, template, pk.Public(), pk) if err != nil { - return nil, err + return nil, nil, err } - tlsCert := tls.Certificate{ - Certificate: [][]byte{cert}, - PrivateKey: pk, - } - - return &tlsCert, nil - - //conn, err := grpc.DialContext(ctx, net.JoinHostPort(addr, port), - // grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)), - //) + return cert, pk, nil } -func GenerateCertFile() error { - pk, err := rsa.GenerateKey(rand.Reader, 2048) +func GenerateCertFile(cfg CertificateCfg) error { + cert, pk, err := GenerateCert(cfg.CertCfg) if err != nil { return err } - template := &x509.Certificate{ - SerialNumber: big.NewInt(1), - Subject: pkix.Name{ - Organization: []string{"MultiversX"}, - CommonName: "MultiversX Bridge", // Will be checked by the server - }, - DNSNames: []string{"localhost"}, - NotBefore: time.Now(), - NotAfter: time.Now().Add(time.Hour), - KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, - ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, - BasicConstraintsValid: true, + certOut, err := os.Create(cfg.CertFileCfg.OutFileCert) + if err != nil { + return err } + defer func() { + err = certOut.Close() + log.LogIfError(err) + }() - cert, err := x509.CreateCertificate(rand.Reader, template, template, pk.Public(), pk) + err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: cert}) if err != nil { return err } - certFile := "certificate.crt" - keyFile := "private_key.pem" - - certOut, err := os.Create(certFile) + keyOut, err := os.Create(cfg.CertFileCfg.OutFilePk) if err != nil { return err } - defer certOut.Close() - pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: cert}) + defer func() { + err = keyOut.Close() + log.LogIfError(err) + }() - keyOut, err := os.Create(keyFile) + privBytes := x509.MarshalPKCS1PrivateKey(pk) + err = pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: privBytes}) if err != nil { return err } - defer keyOut.Close() - privBytes := x509.MarshalPKCS1PrivateKey(pk) - pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: privBytes}) return nil } diff --git a/cert/certificate.crt b/cert/certificate.crt new file mode 100644 index 0000000..cede562 --- /dev/null +++ b/cert/certificate.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDMzCCAhugAwIBAgIQZRWJbdDEYUsEetoVBpuWpTANBgkqhkiG9w0BAQsFADAq +MRMwEQYDVQQKEwpNdWx0aXZlcnNYMRMwEQYDVQQDEwpNdWx0aXZlcnNYMB4XDTIz +MTIxNTEzMDQxOFoXDTIzMTIxNTIzMDQxOFowKjETMBEGA1UEChMKTXVsdGl2ZXJz +WDETMBEGA1UEAxMKTXVsdGl2ZXJzWDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAL9Me6/qYZSCYMrvEQaUOLPSa0x0UC2xzCo894wYEG4zf/oCnBvjEssg +prFbjqiIBKiIxgl4EjwHaOnSblhv0xWsdxiZHtQDzo2VwAts50mj8mqfEpGPkXKi +u2m2K2TdLytkrVnn2iIUij31uII25Bd72uVZWdJbQZPNRjgnVfEfx+1fuA7g0gA1 +YkN8Ao0NW8Jj3KxT/xZbZSXk/uc8XhXBQPqE8CNmgSg1t7ZDl9s0Ek3HxkHUjCqV +zHlhm6+FXE8QWSrGiFcW+WPqCdNvm7ySkeTOaJCR8Ii4mhlpm5o5+f8ZAnMp4u3H +68gWkqz132Lk4yFopbktziT4I8eqW4MCAwEAAaNVMFMwDgYDVR0PAQH/BAQDAgWg +MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMBQG +A1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAJHm8LUuV8mgr +gpgpJarNxUw0WQfyIdxsYC6yiLP3R69leb3DGpOwAHbeAjvq6cEtgAEHWb8pYXDL +f6zBbNbsnu70e2CZP/Dp4Rvob1Sl8QLlhDhftl4jKOhhXzUXRo5mogy3cAPSTCHz +UDeatEunvC3lKOGb2Og+8sbBfYAcnThVqF3efI8NPRnzsUMJKSzGNobIYFjDYrtm +zOHhx5gaAZ6GCNueA+CAEBue74I/JfdbiFjTU3Racwci0cUCXxjXNOI0MWmYi7J5 +93rYKsWvhPNcyJ3jEksorhfKAjW4s6zvPwOZv2m01TIJ6KTVqqPRCAtiVm2mWXyW +vc6vRcBWBg== +-----END CERTIFICATE----- diff --git a/cert/cmd/cert/main.go b/cert/cmd/cert/main.go index ecc9a94..25d49fc 100644 --- a/cert/cmd/cert/main.go +++ b/cert/cmd/cert/main.go @@ -7,6 +7,16 @@ import ( ) func main() { - err := cert.GenerateCertFile() + err := cert.GenerateCertFile(cert.CertificateCfg{ + CertCfg: cert.CertCfg{ + Organization: "MultiversX", + DNSName: "localhost", + Availability: 10, + }, + CertFileCfg: cert.CertFileCfg{ + OutFileCert: "certificate.crt", + OutFilePk: "private_key.pem", + }, + }) fmt.Println(err) } diff --git a/cert/private_key.pem b/cert/private_key.pem new file mode 100644 index 0000000..1db5540 --- /dev/null +++ b/cert/private_key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAv0x7r+phlIJgyu8RBpQ4s9JrTHRQLbHMKjz3jBgQbjN/+gKc +G+MSyyCmsVuOqIgEqIjGCXgSPAdo6dJuWG/TFax3GJke1APOjZXAC2znSaPyap8S +kY+RcqK7abYrZN0vK2StWefaIhSKPfW4gjbkF3va5VlZ0ltBk81GOCdV8R/H7V+4 +DuDSADViQ3wCjQ1bwmPcrFP/FltlJeT+5zxeFcFA+oTwI2aBKDW3tkOX2zQSTcfG +QdSMKpXMeWGbr4VcTxBZKsaIVxb5Y+oJ02+bvJKR5M5okJHwiLiaGWmbmjn5/xkC +cyni7cfryBaSrPXfYuTjIWiluS3OJPgjx6pbgwIDAQABAoIBACYhUZob5r1aS37H +riYYj0DQlVCU8pJZGS/mHRWQil3c6ApmUMWCOnHAnVlGvaW8Dumk8YxboY7Tj0bk +CdiY2YM9cDO3+Zwa8iXojnH4kBVul1hHQsU+z6gA5chJZlbhe5BzrdX4z9LxMyjs +fI1/8XD44AXNDIlQZT7XsMJqnMfFzJ1Lw659iOTe+QqgKPJXFiDYtisEZG71rfjA +9awmvX39jejzcyiUkNlv4wyRyuiX0xr24FOcXuHk0DNwkdDHLaFqWzF9IpXUOJqu +JQNMroSnhaPd0P2MvQOH4HtcLlYkoCamn9IYD9AD3PM8I4mmwaLgQJX68+ifhDEr +Iue6lxkCgYEA03vWxpW0EkkVTdm8jUqmUSkChxDyG1Prftg1RoDnXp6dN+//9spB +bmQM1f8LDn66dWEO6XXcgPh+aCGQSySs3wvOYJN5amBRFwqkpbXjpgsCIp1qm1g9 +uYKzm0CH8UaDnjdoE+vhAjKQwHZdGcj3nZCVtI9gn+dzaEtOW6wpgU0CgYEA55Dx +KY5Q6wR6he3AaDeklmNkh0qhYFAzt7FICsPhsbVchExmDBovGUXDFWePjxh/Q09q +J2Tum5VqqMCb7S1Tyak+FC/mNcF92wBr8e7BF3kLcP7t9zW/V6/fLCHKSqqCeoXZ +NvI1xbR//lxsQ1/XtBnNdUXnnGTWRNW8wB1G6A8CgYEAsi6H0b81/aYHxhTq0RyR +LpZf4866PZ4iLzgZAvL+fXEkQ4n5XkQghtLTIcYF2cuaa+U/vCGqjBtR3YhR243l +/PMkiagXRzIpgEFeYaPzTuW9gc6hkIrzToa5rtfa8cUYhchm70nwxXo3DYFshZoW +TnIQQBYBMhi+2qOAPKq8OY0CgYBubLvT6T3FFLmorBuYlxAxduw1Z+1UlGpVKoEE +QSybJbUckaIIG2RiVNYWmu/mePQXEQO6DXOLVdEq785rZ7YQ8FfeIIlTERYHHUhc +clI580r1c1vfCw5XrlJqJSLmQDFAZBuVDCOAR/bRQRmPd2DRTYygY9lyxtM2uAXu +RwfNGQKBgQCC8TVhfhu5dtFZqyTewN0YIIG1fuZBhXvKkWinSlmSsM6XO9oqE9p9 +bGqv6IFvsyI2NbM5omETfAvaedbnjG7TL8NszGv+3u98dn8vZMZdgvXAsnqzf/tO +79TMMpzTuZATHX7qlUMXRTSGEinVCKXvGJXudvfDZwqooq9DkV1NWw== +-----END RSA PRIVATE KEY----- diff --git a/client/cmd/client/certificate.crt b/client/cmd/client/certificate.crt deleted file mode 100644 index e023772..0000000 --- a/client/cmd/client/certificate.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDMjCCAhqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAxMRMwEQYDVQQKEwpNdWx0 -aXZlcnNYMRowGAYDVQQDExFNdWx0aXZlcnNYIEJyaWRnZTAeFw0yMzEyMTUxMDQ3 -MDJaFw0yMzEyMTUxMTQ3MDJaMDExEzARBgNVBAoTCk11bHRpdmVyc1gxGjAYBgNV -BAMTEU11bHRpdmVyc1ggQnJpZGdlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAwfhRKyHh3ozOm86A1n3njv8/Ju4shZ0DM+PAciPuyKFe9Z3bWcPqHZTe -RNt4sESUMWS+1LZZ23g5etDrLDH9obRXMtsKvQWP9eh5YQldz86qUebmXtw6gFNo -6lcjq4sced6wjO0su0Hzxy274S1/8SPuTeUPslpP1JNncn03UWis3SvURF6N0wHj -LKJNU20M1EhP8OCCciNq59bn3pBlkhFHVru0BOxHzgT79ZYVG/PSF2FfuqDyfp53 -dg6ZHdlQqVcwRYrEn2pBw3EZ1MO8sqSULTszDev3tZeqa+9x5hrLo/Ch0hLp/h1f -BFAPjbAETdlp77Ne/tUReEPFhCeK8wIDAQABo1UwUzAOBgNVHQ8BAf8EBAMCBaAw -HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwFAYD -VR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQAoYxPvJQwn5QwU -I8Fr+rHP16R8DM1Hi7H9WV30RshSimhJ2IolKqI9oWvsLJ0loGOYwD3UgXlKMinI -1U44MSraqGj5XP0/Pg87/we72GAnYjrDAYc3e5lq08o70UDM6jVKFN6Ctqzt5CDZ -eSrNXEVgXf4scDP804lUy6lHOtwTDxQWh+AbtH7TuqoYQc8ZA8FeVIolDh8/ozyo -nFN55dwTisghWSg+2VjNihJxoqgm7m0l8i2tpURpXxlmhSlAnwkijIH8BiEcqqvL -kFjJYePcA89Xjfru3xR5dTFHP8y/prHBPR1N8BV0QWdrrirGm7lCmjpilK3YGdBu -VE+39f0l ------END CERTIFICATE----- diff --git a/client/cmd/client/private_key.pem b/client/cmd/client/private_key.pem deleted file mode 100644 index d4df8a1..0000000 --- a/client/cmd/client/private_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEAwfhRKyHh3ozOm86A1n3njv8/Ju4shZ0DM+PAciPuyKFe9Z3b -WcPqHZTeRNt4sESUMWS+1LZZ23g5etDrLDH9obRXMtsKvQWP9eh5YQldz86qUebm -Xtw6gFNo6lcjq4sced6wjO0su0Hzxy274S1/8SPuTeUPslpP1JNncn03UWis3SvU -RF6N0wHjLKJNU20M1EhP8OCCciNq59bn3pBlkhFHVru0BOxHzgT79ZYVG/PSF2Ff -uqDyfp53dg6ZHdlQqVcwRYrEn2pBw3EZ1MO8sqSULTszDev3tZeqa+9x5hrLo/Ch -0hLp/h1fBFAPjbAETdlp77Ne/tUReEPFhCeK8wIDAQABAoIBAQCpCNTzWZuUbfC/ -Jr5wLVhV7WoDaxuxdJsN5TQYQ+gbP0WZle9J0sl67fik2P3b3memg70pcZ/s+mBc -/yNyaD43ZQl4cBpzjx1dlzHvtlHifp8+sJGhqRnyKr4LOdUD8T7nlYEVzrpklZzz -vo80NIqCgmVxzGRZcQqQncRQqX5DmgWKHH+wTh+2jVAT4EuANsp1Gv94Te2kWyoa -TwPVbHjCclOl+07BR7+8h961Rq6AJKTd1NKA1+dkELgjBJEe+jG1tg7rZPgk0pDU -Yn3EzAKbW0/aUMQhEvLqzCsi+qYiafGo5Q9/yDJYshwsANheR7gai/yQZXOF7Z6M -0K/9UdSBAoGBAMVcW/g8oOW4g+GsokT0W/zfR7WcnNhRt+4GiyiomMFWl4vhty3n -1wl35TtivU/8B9X/ZiBEg3FrR1eOeNEQ1eti3imteRgVEQGge7fiRlNFmr9s0ds9 -dX+ij/iCEkMM9cqosAE6TLQsQMsJ8ZjSpVp8gNTWwfk4zL1831klB+E5AoGBAPua -DD0UexDT5gEQedBbU7aBnkq04ZACwrRm1MYcnQh2zxYJVjC2PrptLvEtBJK/X9Lq -gRLTsojgBmwWynC3pzK2yQsIuMNEaSWRyPF1p8zd5auhrWANwCRjgKhqJJLx4xym -8+wgeLVnRIM0S5UJJJjPbVlWCczapYPzb1bB30mLAoGBAJlmV0nT/g9v4nn3T80e -zZz4A2nCyBpPMhI9Xc6FdO3Zm0MrdtCkgfynBzKoZZMUxxZrQ/rSpgPzKWmBoKCH -YG5r01g7sIKqZSSJk3/yzUyOLmCZeWfaFkjVlufGWeFp4mXZxau+n73vI5FtMi7h -k4qIeS51miFXJ7QkqglFAiHpAoGBALofVkhk+zkSmAZXitVwiffr4Q5Ays/+yswr -eeFoT15wjXcuxvzYBIViuaQd+lEYkyly4rLruhn5J6cUIQPLSDuC7ixkclG5LNNn -CjBdKhmqWPlja98vrOD+XrG3e4DcwXZzpuQZjVIcp5kruXHxxonogGri8/MAGAsJ -rWaPmr9LAoGBAMOoR8EHuwidMoMbifhWoh6/v8uCO5iKWndPLQkhHmCIx2l1G4e0 -Em1CQ7LmML3pJwxIg+wB+4KOItg7fGP23C6wlWNeF29N8/tKWICQhB4L0jq3FHNU -rA4MWxOAl+mVmDt0h6rlSh0fDJsDsW4XC46nY+dK0sa5o/Wu1tYGMKc0 ------END RSA PRIVATE KEY----- diff --git a/client/factory.go b/client/factory.go index 7802f44..b68e69a 100644 --- a/client/factory.go +++ b/client/factory.go @@ -36,7 +36,7 @@ func CreateClient(cfg *config.ClientConfig) (ClientHandler, error) { func connectWithRetrials(host string) (GRPCConn, error) { //credentials := insecure.NewCredentials() //opts := grpc.WithTransportCredentials(credentials) - certt, err := cert.LoadCertificate("certificate.crt", "private_key.pem") + certt, err := cert.LoadCertificate("../../../cert/certificate.crt", "../../../cert/private_key.pem") if err != nil { return nil, err } diff --git a/server/cmd/server/certificate.crt b/server/cmd/server/certificate.crt deleted file mode 100644 index e023772..0000000 --- a/server/cmd/server/certificate.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDMjCCAhqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAxMRMwEQYDVQQKEwpNdWx0 -aXZlcnNYMRowGAYDVQQDExFNdWx0aXZlcnNYIEJyaWRnZTAeFw0yMzEyMTUxMDQ3 -MDJaFw0yMzEyMTUxMTQ3MDJaMDExEzARBgNVBAoTCk11bHRpdmVyc1gxGjAYBgNV -BAMTEU11bHRpdmVyc1ggQnJpZGdlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAwfhRKyHh3ozOm86A1n3njv8/Ju4shZ0DM+PAciPuyKFe9Z3bWcPqHZTe -RNt4sESUMWS+1LZZ23g5etDrLDH9obRXMtsKvQWP9eh5YQldz86qUebmXtw6gFNo -6lcjq4sced6wjO0su0Hzxy274S1/8SPuTeUPslpP1JNncn03UWis3SvURF6N0wHj -LKJNU20M1EhP8OCCciNq59bn3pBlkhFHVru0BOxHzgT79ZYVG/PSF2FfuqDyfp53 -dg6ZHdlQqVcwRYrEn2pBw3EZ1MO8sqSULTszDev3tZeqa+9x5hrLo/Ch0hLp/h1f -BFAPjbAETdlp77Ne/tUReEPFhCeK8wIDAQABo1UwUzAOBgNVHQ8BAf8EBAMCBaAw -HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwFAYD -VR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQAoYxPvJQwn5QwU -I8Fr+rHP16R8DM1Hi7H9WV30RshSimhJ2IolKqI9oWvsLJ0loGOYwD3UgXlKMinI -1U44MSraqGj5XP0/Pg87/we72GAnYjrDAYc3e5lq08o70UDM6jVKFN6Ctqzt5CDZ -eSrNXEVgXf4scDP804lUy6lHOtwTDxQWh+AbtH7TuqoYQc8ZA8FeVIolDh8/ozyo -nFN55dwTisghWSg+2VjNihJxoqgm7m0l8i2tpURpXxlmhSlAnwkijIH8BiEcqqvL -kFjJYePcA89Xjfru3xR5dTFHP8y/prHBPR1N8BV0QWdrrirGm7lCmjpilK3YGdBu -VE+39f0l ------END CERTIFICATE----- diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go index 3ab7a09..dd8f7e3 100644 --- a/server/cmd/server/main.go +++ b/server/cmd/server/main.go @@ -78,25 +78,7 @@ func startServer(ctx *cli.Context) error { return err } - certCfg, err := cert.GenerateCert() - if err != nil { - return err - } - - CertPool := x509.NewCertPool() - - //certLeaf, err := x509.ParseCertificate(certCfg.Certificate[0]) - //if err != nil { - // return err - //} - - tlsConfig := &tls.Config{ - Certificates: []tls.Certificate{*certCfg}, - ClientCAs: CertPool, - ClientAuth: tls.RequireAndVerifyClientCert, - } - - certt, err := cert.LoadCertificate("certificate.crt", "private_key.pem") + certt, err := cert.LoadCertificate("../../../cert/certificate.crt", "../../../cert/private_key.pem") if err != nil { return err } @@ -104,8 +86,9 @@ func startServer(ctx *cli.Context) error { if err != nil { return err } + CertPool := x509.NewCertPool() CertPool.AddCert(certLeaf) - tlsConfig = &tls.Config{ + tlsConfig := &tls.Config{ Certificates: []tls.Certificate{certt}, ClientCAs: CertPool, ClientAuth: tls.RequireAndVerifyClientCert, diff --git a/server/cmd/server/private_key.pem b/server/cmd/server/private_key.pem deleted file mode 100644 index d4df8a1..0000000 --- a/server/cmd/server/private_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEAwfhRKyHh3ozOm86A1n3njv8/Ju4shZ0DM+PAciPuyKFe9Z3b -WcPqHZTeRNt4sESUMWS+1LZZ23g5etDrLDH9obRXMtsKvQWP9eh5YQldz86qUebm -Xtw6gFNo6lcjq4sced6wjO0su0Hzxy274S1/8SPuTeUPslpP1JNncn03UWis3SvU -RF6N0wHjLKJNU20M1EhP8OCCciNq59bn3pBlkhFHVru0BOxHzgT79ZYVG/PSF2Ff -uqDyfp53dg6ZHdlQqVcwRYrEn2pBw3EZ1MO8sqSULTszDev3tZeqa+9x5hrLo/Ch -0hLp/h1fBFAPjbAETdlp77Ne/tUReEPFhCeK8wIDAQABAoIBAQCpCNTzWZuUbfC/ -Jr5wLVhV7WoDaxuxdJsN5TQYQ+gbP0WZle9J0sl67fik2P3b3memg70pcZ/s+mBc -/yNyaD43ZQl4cBpzjx1dlzHvtlHifp8+sJGhqRnyKr4LOdUD8T7nlYEVzrpklZzz -vo80NIqCgmVxzGRZcQqQncRQqX5DmgWKHH+wTh+2jVAT4EuANsp1Gv94Te2kWyoa -TwPVbHjCclOl+07BR7+8h961Rq6AJKTd1NKA1+dkELgjBJEe+jG1tg7rZPgk0pDU -Yn3EzAKbW0/aUMQhEvLqzCsi+qYiafGo5Q9/yDJYshwsANheR7gai/yQZXOF7Z6M -0K/9UdSBAoGBAMVcW/g8oOW4g+GsokT0W/zfR7WcnNhRt+4GiyiomMFWl4vhty3n -1wl35TtivU/8B9X/ZiBEg3FrR1eOeNEQ1eti3imteRgVEQGge7fiRlNFmr9s0ds9 -dX+ij/iCEkMM9cqosAE6TLQsQMsJ8ZjSpVp8gNTWwfk4zL1831klB+E5AoGBAPua -DD0UexDT5gEQedBbU7aBnkq04ZACwrRm1MYcnQh2zxYJVjC2PrptLvEtBJK/X9Lq -gRLTsojgBmwWynC3pzK2yQsIuMNEaSWRyPF1p8zd5auhrWANwCRjgKhqJJLx4xym -8+wgeLVnRIM0S5UJJJjPbVlWCczapYPzb1bB30mLAoGBAJlmV0nT/g9v4nn3T80e -zZz4A2nCyBpPMhI9Xc6FdO3Zm0MrdtCkgfynBzKoZZMUxxZrQ/rSpgPzKWmBoKCH -YG5r01g7sIKqZSSJk3/yzUyOLmCZeWfaFkjVlufGWeFp4mXZxau+n73vI5FtMi7h -k4qIeS51miFXJ7QkqglFAiHpAoGBALofVkhk+zkSmAZXitVwiffr4Q5Ays/+yswr -eeFoT15wjXcuxvzYBIViuaQd+lEYkyly4rLruhn5J6cUIQPLSDuC7ixkclG5LNNn -CjBdKhmqWPlja98vrOD+XrG3e4DcwXZzpuQZjVIcp5kruXHxxonogGri8/MAGAsJ -rWaPmr9LAoGBAMOoR8EHuwidMoMbifhWoh6/v8uCO5iKWndPLQkhHmCIx2l1G4e0 -Em1CQ7LmML3pJwxIg+wB+4KOItg7fGP23C6wlWNeF29N8/tKWICQhB4L0jq3FHNU -rA4MWxOAl+mVmDt0h6rlSh0fDJsDsW4XC46nY+dK0sa5o/Wu1tYGMKc0 ------END RSA PRIVATE KEY-----