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

Merge branch 'main' of gon:Uni/CSI-ES-2324

Browse source
This commit is contained in:
Afonso Franco 2024-04-20 00:01:26 +01:00
commit cfe9f3c7b3
Signed by: afonso
SSH key fingerprint: SHA256:aiLbdlPwXKJS5wMnghdtod0SPy8imZjlVvCyUX9DJNk
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,18 +120,18 @@ func (k *KeyStore) GetClientTLSConfig() *tls.Config {
if err != nil {
return err
}
oidMap := ExtractAllOIDValues(cert)
oidMap := ExtractAllOIDValues(cert)
// Check if the certificate is signed by the specified CA
_, err = cert.Verify(opts)
if err != nil {
return errors.New("certificate not signed by trusted CA")
return errors.New("certificate not signed by trusted CA")
}
//Check if the pseudonym field is set to "SERVER"
if oidMap["2.5.4.65"] != "SERVER"{
return errors.New("peer isn't the server")
}
//Check if the pseudonym field is set to "SERVER"
if oidMap["2.5.4.65"] != "SERVER" {
return errors.New("peer isn't the server")
}
}
return nil
}
@ -178,7 +178,30 @@ func (k KeyStore) EncryptMessageContent(receiverCert *x509.Certificate, content
}
func (k KeyStore) DecryptMessageContent(senderCert *x509.Certificate, cipherContent []byte) []byte {
return nil
encryptedDataKey, encryptedMsg := unPair(cipherContent)
dataKey, err := rsa.DecryptOAEP(sha256.New(), rand.Reader, k.GetPrivKey(), encryptedDataKey, nil)
if err != nil {
log.Panicln("Could not decrypt dataKey: ", err)
}
// decrypt ciphertext
cipher, err := chacha20poly1305.New(dataKey)
if err != nil {
log.Panicln("Could not create cipher: ", err)
}
nonce, ciphertext := encryptedMsg[:cipher.NonceSize()], encryptedMsg[cipher.NonceSize():]
contentAndSig, err := cipher.Open(nil, nonce, ciphertext, nil)
if err != nil {
log.Panicln("Could not decrypt ciphertext: ", err)
}
// check signature with sender public key
content, signature := unPair(contentAndSig)
hashedContent := sha256.Sum256(content)
senderKey := senderCert.PublicKey.(*rsa.PublicKey)
if err := rsa.VerifyPKCS1v15(senderKey, crypto.SHA256, hashedContent[:], signature); err != nil {
log.Panicln("Signature is not valid: ", err)
}
return content
}
func pair(l []byte, r []byte) []byte {