Skip to content

Commit

Permalink
[v15] Simplify IsBoringCrypto (#47501)
Browse files Browse the repository at this point in the history
* Simplify IsBoringCrypto

* fix-license for new files
  • Loading branch information
espadolini authored Nov 5, 2024
1 parent bf68413 commit 604788b
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 11 deletions.
32 changes: 32 additions & 0 deletions lib/auth/native/boring.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Teleport
// Copyright (C) 2024 Gravitational, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program 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 Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

//go:build boringcrypto

package native

import "crypto/boring"

// IsBoringBinary checks if the binary was compiled with BoringCrypto.
//
// It's possible to enable the boringcrypto GOEXPERIMENT (which will enable the
// boringcrypto build tag) even on platforms that don't support the boringcrypto
// module, which results in crypto packages being available and working, but not
// actually using a certified cryptographic module, so we have to check
// [boring.Enabled] even if this is compiled in.
func IsBoringBinary() bool {
return boring.Enabled()
}
11 changes: 0 additions & 11 deletions lib/auth/native/native.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ import (
"crypto/ed25519"
"crypto/rand"
"crypto/rsa"
"crypto/sha256"
"crypto/x509"
"encoding/pem"
"reflect"
"sync"
"testing"
"time"
Expand All @@ -48,15 +46,6 @@ var precomputedKeys = make(chan *rsa.PrivateKey, 25)
// startPrecomputeOnce is used to start the background task that precomputes key pairs.
var startPrecomputeOnce sync.Once

// IsBoringBinary checks if the binary was compiled with BoringCrypto.
func IsBoringBinary() bool {
// Check the package name for one of the boring primitives, if the package
// path is from BoringCrypto, we know this binary was compiled against the
// dev.boringcrypto branch of Go.
hash := sha256.New()
return reflect.TypeOf(hash).Elem().PkgPath() == "crypto/internal/boring"
}

// GenerateKeyPair generates a new RSA key pair.
func GenerateKeyPair() ([]byte, []byte, error) {
priv, err := GeneratePrivateKey()
Expand Down
27 changes: 27 additions & 0 deletions lib/auth/native/notboring.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Teleport
// Copyright (C) 2024 Gravitational, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program 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 Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

//go:build !boringcrypto

package native

// IsBoringBinary checks if the binary was compiled with BoringCrypto.
//
// The boringcrypto GOEXPERIMENT always sets the boringcrypto build tag, so if
// this is compiled in, we're not using BoringCrypto.
func IsBoringBinary() bool {
return false
}

0 comments on commit 604788b

Please sign in to comment.