Uni/CSI-ES-2324
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PD1] minor change

Browse source
This commit is contained in:
Tiago Sousa 2024-04-23 11:14:09 +01:00
parent b8efcf19b7
commit 0fa940f853
Signed by: tiago
SSH key fingerprint: SHA256:odOD9vln9U7qNe1R8o3UCbE3jkQCkr5/q5mgd5hwua0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projs/PD1/internal/utils/cryptoUtils/cryptoUtils.go
View file

@ -50,12 +50,12 @@ func LoadKeyStore(keyStorePath string, password string) KeyStore {
var privKey *rsa.PrivateKey var privKey *rsa.PrivateKey
certFile, err := os.ReadFile(keyStorePath) keystoreBytes, err := os.ReadFile(keyStorePath)
if err != nil { if err != nil {
log.Panicln("Provided certificate couldn't be opened") log.Panicln("Provided keystorePath couldn't be opened")
} }
privKeyInterface, cert, caCerts, err := pkcs12.DecodeChain(certFile, password) privKeyInterface, cert, caCerts, err := pkcs12.DecodeChain(keystoreBytes, password)
if err != nil { if err != nil {
log.Panicln("PKCS12 key store couldn't be decoded") log.Panicln("PKCS12 key store couldn't be decoded")
} }
@ -94,7 +94,7 @@ func (k *KeyStore) GetServerTLSConfig() *tls.Config {
caCertPool.AddCert(caCert) caCertPool.AddCert(caCert)
} }
tlsConfig.ClientCAs = caCertPool tlsConfig.ClientCAs = caCertPool
//FIX: SERVER ACCEPTS CONNECTIONS WITH UNMATCHING OR //FIX: SERVER ACCEPTS CONNECTIONS WITH UNMATCHING OR
// NO CERTIFICATE, NEEDS TO BE CHANGED SOMEHOW // NO CERTIFICATE, NEEDS TO BE CHANGED SOMEHOW
tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
return tlsConfig return tlsConfig