forked from Silverfish/proton-bridge
GODT-1754: Add logs for unilateral updates and SEARCH.
This commit is contained in:
41
pkg/algo/hash.go
Normal file
41
pkg/algo/hash.go
Normal file
@ -0,0 +1,41 @@
|
||||
// Copyright (c) 2022 Proton AG
|
||||
//
|
||||
// This file is part of Proton Mail Bridge.
|
||||
//
|
||||
// Proton Mail Bridge is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Proton Mail Bridge is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
package algo
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
)
|
||||
|
||||
func Hash256(b []byte) []byte {
|
||||
h := sha256.Sum256(b)
|
||||
return h[:]
|
||||
}
|
||||
|
||||
func HashBase64SHA256(s string) string {
|
||||
return base64.StdEncoding.EncodeToString(
|
||||
Hash256([]byte(s)),
|
||||
)
|
||||
}
|
||||
|
||||
func HashHexSHA256(s string) string {
|
||||
return hex.EncodeToString(
|
||||
Hash256([]byte(s)),
|
||||
)
|
||||
}
|
||||
@ -18,8 +18,7 @@
|
||||
package message
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"github.com/ProtonMail/proton-bridge/v2/pkg/algo"
|
||||
)
|
||||
|
||||
type boundary struct {
|
||||
@ -31,13 +30,6 @@ func newBoundary(seed string) *boundary {
|
||||
}
|
||||
|
||||
func (bw *boundary) gen() string {
|
||||
hash := sha256.New()
|
||||
|
||||
if _, err := hash.Write([]byte(bw.val)); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
bw.val = hex.EncodeToString(hash.Sum(nil))
|
||||
|
||||
bw.val = algo.HashHexSHA256(bw.val)
|
||||
return bw.val
|
||||
}
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
package pmapi
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
|
||||
"github.com/ProtonMail/proton-bridge/v2/pkg/algo"
|
||||
)
|
||||
|
||||
// ErrTLSMismatch indicates that no TLS fingerprint match could be found.
|
||||
@ -63,6 +63,5 @@ func (p *pinChecker) checkCertificate(conn net.Conn) error {
|
||||
}
|
||||
|
||||
func certFingerprint(cert *x509.Certificate) string {
|
||||
hash := sha256.Sum256(cert.RawSubjectPublicKeyInfo)
|
||||
return fmt.Sprintf(`pin-sha256=%q`, base64.StdEncoding.EncodeToString(hash[:]))
|
||||
return fmt.Sprintf(`pin-sha256=%q`, algo.HashBase64SHA256(string(cert.RawSubjectPublicKeyInfo)))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user