-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #207 from dbenoit17/go1.22-fix-std-crypto
Only load OpenSSL when in FIPS mode.
- Loading branch information
Showing
1 changed file
with
43 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go | ||
index 3d3a9a36ee..b7a65a1f6e 100644 | ||
--- a/src/crypto/internal/backend/openssl.go | ||
+++ b/src/crypto/internal/backend/openssl.go | ||
@@ -25,6 +25,21 @@ var enabled bool | ||
var knownVersions = [...]string{"3", "1.1", "11", "111", "1.0.2", "1.0.0", "10"} | ||
|
||
func init() { | ||
+ // 0: FIPS opt-out: abort the process if it is enabled and can't be disabled. | ||
+ // 1: FIPS required: abort the process if it is not enabled and can't be enabled. | ||
+ // other values: do not override OpenSSL configured FIPS mode. | ||
+ var fips string | ||
+ if v, ok := syscall.Getenv("GOLANG_FIPS"); ok { | ||
+ fips = v | ||
+ } else if hostFIPSModeEnabled() { | ||
+ // System configuration can only force FIPS mode. | ||
+ fips = "1" | ||
+ } | ||
+ | ||
+ if fips == "" { | ||
+ return | ||
+ } | ||
+ | ||
version, _ := syscall.Getenv("GO_OPENSSL_VERSION_OVERRIDE") | ||
if version == "" { | ||
var fallbackVersion string | ||
@@ -49,16 +64,6 @@ func init() { | ||
if err := openssl.Init(version); err != nil { | ||
panic("opensslcrypto: can't initialize OpenSSL " + version + ": " + err.Error()) | ||
} | ||
- // 0: FIPS opt-out: abort the process if it is enabled and can't be disabled. | ||
- // 1: FIPS required: abort the process if it is not enabled and can't be enabled. | ||
- // other values: do not override OpenSSL configured FIPS mode. | ||
- var fips string | ||
- if v, ok := syscall.Getenv("GOLANG_FIPS"); ok { | ||
- fips = v | ||
- } else if hostFIPSModeEnabled() { | ||
- // System configuration can only force FIPS mode. | ||
- fips = "1" | ||
- } | ||
switch fips { | ||
case "0": | ||
if openssl.FIPS() { |