289 lines
14 KiB
Diff
289 lines
14 KiB
Diff
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
|
|
index 5f258a2..5dbbc42 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/boring/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
|
|
index d6d99b1..f2fe332 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/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go
|
|
index 079fc3c..e826d0b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/ecdh.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go
|
|
index 0b61e79..94d0c98 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/ecdsa.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go
|
|
index afec529..d822152 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/goopenssl.h b/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
|
|
index 6d6a562..17cc314 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/hkdf.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go
|
|
index ae40b93..17bc075 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/hmac.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go
|
|
index 6f00177..f466b18 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/notboring.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go
|
|
index 7c0b5d6..262af07 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go
|
|
index d49194d..ff15054 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_ecdsa_signature.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c
|
|
index 2349db1..57fbb04 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_evp.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
|
index 4379019..5034c46 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_lock_setup.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c
|
|
index 49d40a7..3b3dbf8 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_port_aead_gcm.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c
|
|
index 7eb645e..1c3225a 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_port_ctr128.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c
|
|
index df4ebe3..876393b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_port_evp_md5_sha1.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c
|
|
index 2eedd5b..04510d3 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_port_hmac.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c
|
|
index 362d9e5..bebafef 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_port_rsa.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c
|
|
index 2824147..8bc1d85 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/openssl_stub_rand.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c
|
|
index 22bd865..b7aa26b 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/rand.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go
|
|
index b3668b8..dcdae70 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/rsa.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go
|
|
index 915c840..8623d9d 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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-fips/openssl/sha.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go
|
|
index 0b55ced..57309c0 100644
|
|
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go
|
|
+++ b/src/vendor/github.com/golang-fips/openssl-fips/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
|
|
|