375 lines
17 KiB
Diff
375 lines
17 KiB
Diff
diff --git a/src/crypto/boring/boring.go b/src/crypto/boring/boring.go
|
|
index 47618fe..d93784d 100644
|
|
--- a/src/crypto/boring/boring.go
|
|
+++ b/src/crypto/boring/boring.go
|
|
@@ -2,7 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build boringcrypto
|
|
+//go:build boringcrypto && !static
|
|
|
|
// Package boring exposes functions that are only available when building with
|
|
// Go+BoringCrypto. This package is available on all targets as long as the
|
|
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
|
|
index 33a53a8..f630ea5 100644
|
|
--- a/src/crypto/internal/backend/nobackend.go
|
|
+++ b/src/crypto/internal/backend/nobackend.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
|
|
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
|
|
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static
|
|
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
|
|
|
|
package backend
|
|
|
|
diff --git a/src/crypto/internal/backend/openssl.go b/src/crypto/internal/backend/openssl.go
|
|
index 59370ec..eb81ef6 100644
|
|
--- a/src/crypto/internal/backend/openssl.go
|
|
+++ b/src/crypto/internal/backend/openssl.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && cgo && !android && !gocrypt && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,cgo,!android,!gocrypt,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
// Package openssl provides access to OpenSSLCrypto implementation functions.
|
|
// Check the variable Enabled to find out whether OpenSSLCrypto is available.
|
|
diff --git a/src/crypto/internal/boring/div_test.c b/src/crypto/internal/boring/div_test.c
|
|
index f909cc9..8530533 100644
|
|
--- a/src/crypto/internal/boring/div_test.c
|
|
+++ b/src/crypto/internal/boring/div_test.c
|
|
@@ -1,4 +1,5 @@
|
|
// Copyright 2022 The Go Authors. All rights reserved.
|
|
+// +build !static
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
diff --git a/src/crypto/internal/boring/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
|
|
index 2b11049..dec1cb2 100644
|
|
--- a/src/crypto/internal/boring/goboringcrypto.h
|
|
+++ b/src/crypto/internal/boring/goboringcrypto.h
|
|
@@ -1,4 +1,5 @@
|
|
// Copyright 2017 The Go Authors. All rights reserved.
|
|
+// +build !static
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
diff --git a/src/crypto/internal/boring/syso/syso.go b/src/crypto/internal/boring/syso/syso.go
|
|
index b338754..db5ea1e 100644
|
|
--- a/src/crypto/internal/boring/syso/syso.go
|
|
+++ b/src/crypto/internal/boring/syso/syso.go
|
|
@@ -2,7 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build boringcrypto
|
|
+//go:build boringcrypto && !static
|
|
|
|
// This package only exists with GOEXPERIMENT=boringcrypto.
|
|
// It provides the actual syso file.
|
|
diff --git a/src/crypto/tls/fipsonly/fipsonly.go b/src/crypto/tls/fipsonly/fipsonly.go
|
|
index e5e4783..a0d9523 100644
|
|
--- a/src/crypto/tls/fipsonly/fipsonly.go
|
|
+++ b/src/crypto/tls/fipsonly/fipsonly.go
|
|
@@ -2,7 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build boringcrypto
|
|
+//go:build boringcrypto && !static
|
|
|
|
// Package fipsonly restricts all TLS configuration to FIPS-approved settings.
|
|
//
|
|
diff --git a/src/crypto/tls/fipsonly/fipsonly_test.go b/src/crypto/tls/fipsonly/fipsonly_test.go
|
|
index f8485dc..6563ac4 100644
|
|
--- a/src/crypto/tls/fipsonly/fipsonly_test.go
|
|
+++ b/src/crypto/tls/fipsonly/fipsonly_test.go
|
|
@@ -2,7 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build boringcrypto
|
|
+//go:build boringcrypto && !static
|
|
|
|
package fipsonly
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/aes.go b/src/vendor/github.com/golang-fips/openssl/openssl/aes.go
|
|
index 079fc3c..e826d0b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/aes.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/aes.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go b/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go
|
|
index 9537870..c491628 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/ecdh.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go b/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go
|
|
index 9f46388..87feb18 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/ecdsa.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/evp.go b/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
|
|
index 46d2bdd..34f4a43 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/evp.go
|
|
@@ -1,5 +1,5 @@
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
|
|
index ac6c64f..5526db9 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h
|
|
@@ -1,4 +1,5 @@
|
|
// Copyright 2017 The Go Authors. All rights reserved.
|
|
+// +build !static
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
// +build linux
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go b/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go
|
|
index 2e21224..83da261 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/hkdf.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
|
|
index 3af1924..57a525a 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/hmac.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go b/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go
|
|
index 5093cde..0610495 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/notboring.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
|
|
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
|
|
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static
|
|
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go b/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go
|
|
index 17a9034..db51ced 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
|
|
index 7ce9833..fe66288 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_ecdsa_signature.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
|
|
index a45ed60..2b541fd 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_evp.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
|
|
index 49d40a7..3b3dbf8 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_lock_setup.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
|
|
index 7eb645e..1c3225a 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_aead_gcm.c
|
|
@@ -1,4 +1,5 @@
|
|
// This file contains a port of the BoringSSL AEAD interface.
|
|
+// +build !static
|
|
// +build linux
|
|
// +build !android
|
|
// +build !no_openssl
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
|
|
index df4ebe3..876393b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ctr128.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
|
|
index 8205b04..dcd751d 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_ecdh.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
|
|
index 2eedd5b..04510d3 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_evp_md5_sha1.c
|
|
@@ -1,4 +1,5 @@
|
|
// This file contains a backport of the EVP_md5_sha1 method.
|
|
+// +build !static
|
|
// +build linux
|
|
// +build !android
|
|
// +build !no_openssl
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
|
|
index a5996d6..2552081 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_hmac.c
|
|
@@ -1,4 +1,5 @@
|
|
// This file contains HMAC portability wrappers.
|
|
+// +build !static
|
|
// +build linux
|
|
// +build !android
|
|
// +build !no_openssl
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
|
|
index e214929..c9f6887 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_port_rsa.c
|
|
@@ -1,4 +1,5 @@
|
|
// This file contains RSA portability wrappers.
|
|
+// +build !static
|
|
// +build linux
|
|
// +build !android
|
|
// +build !no_openssl
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
|
|
index 22bd865..b7aa26b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/openssl_stub_rand.c
|
|
@@ -1,4 +1,5 @@
|
|
// +build linux
|
|
+// +build !static
|
|
// +build !android
|
|
// +build !no_openssl
|
|
// +build !cmd_go_bootstrap
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/rand.go b/src/vendor/github.com/golang-fips/openssl/openssl/rand.go
|
|
index b3668b8..dcdae70 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/rand.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/rand.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go b/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go
|
|
index 7870b93..564db24 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/rsa.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|
|
diff --git a/src/vendor/github.com/golang-fips/openssl/openssl/sha.go b/src/vendor/github.com/golang-fips/openssl/openssl/sha.go
|
|
index 0b55ced..57309c0 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl/openssl/sha.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl/openssl/sha.go
|
|
@@ -2,8 +2,8 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
|
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
|
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
|
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
|
|
|
package openssl
|
|
|