remove useless build tags

2025-04-25 17:50:23 +08:00 · 2017-06-05 13:48:51 -06:00 · 2017-06-05 13:48:51 -06:00 · 0d0212094c
commit 0d0212094c
parent b90544c9b0
28 changed files with 6 additions and 94 deletions
--- a/README.md
+++ b/README.md
@ -18,6 +18,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.

+### Using on macOS
+1. Install [homebrew](http://brew.sh/)
+2. `$ brew install openssl` or `$ brew install openssl@1.1`
+
 ### Using on Windows
 1. Install [mingw-w64](http://mingw-w64.sourceforge.net/)
 2. Install [pkg-config-lite](http://sourceforge.net/projects/pkgconfiglite)
--- a/bio.go
+++ b/bio.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/build.go
+++ b/build.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #cgo pkg-config: libssl libcrypto
--- a/cert.go
+++ b/cert.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/ciphers.go
+++ b/ciphers.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/ciphers_gcm.go
+++ b/ciphers_gcm.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo,!darwin
-
 package openssl

 // #include <openssl/evp.h>
--- a/ciphers_test.go
+++ b/ciphers_test.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build !darwin
-
 package openssl

 import (
--- a/conn.go
+++ b/conn.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/ctx.go
+++ b/ctx.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/dhparam.go
+++ b/dhparam.go
@ -1,5 +1,3 @@
-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/digest.go
+++ b/digest.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/engine.go
+++ b/engine.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 /*
--- a/fips.go
+++ b/fips.go
@ -1,5 +1,3 @@
-// +build cgo
-
 package openssl

 /*
--- a/hmac.go
+++ b/hmac.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/hmac_test.go
+++ b/hmac_test.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 import (
--- a/hostname.go
+++ b/hostname.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 /*
--- a/init.go
+++ b/init.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 /*
 Package openssl is a light wrapper around OpenSSL for Go.

--- a/init_posix.go
+++ b/init_posix.go
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build linux darwin cgo
+// +build linux darwin
 // +build !windows

 package openssl
--- a/init_windows.go
+++ b/init_windows.go
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build windows cgo
+// +build windows

 package openssl

--- a/key.go
+++ b/key.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/mapping.go
+++ b/mapping.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 import (
--- a/old_openssl_compat.go
+++ b/old_openssl_compat.go
@ -1,44 +0,0 @@
-// Copyright (C) 2014 Space Monkey, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !darwin brew
-// +build cgo
-
-package openssl
-
-// #include <openssl/ssl.h>
-import "C"
-
-// these constants do not exist in the openssl version packaged with os x. when
-// darwin decides to update the base openssl version, we can move these back
-// to the appropriate spots in the source. as a workaround, if you need access
-// to these constants on darwin, use homebrew or whatever to install a more
-// recent version of os x, and build the package with the '-tags brew' flag
-
-const (
-	UnsupportedConstraintSyntax VerifyResult = C.X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX
-	UnsupportedConstraintType   VerifyResult = C.X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE
-	UnsupportedExtensionFeature VerifyResult = C.X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE
-	ExcludedViolation           VerifyResult = C.X509_V_ERR_EXCLUDED_VIOLATION
-	SubtreeMinmax               VerifyResult = C.X509_V_ERR_SUBTREE_MINMAX
-	UnsupportedNameSyntax       VerifyResult = C.X509_V_ERR_UNSUPPORTED_NAME_SYNTAX
-	DifferentCrlScope           VerifyResult = C.X509_V_ERR_DIFFERENT_CRL_SCOPE
-	PermittedViolation          VerifyResult = C.X509_V_ERR_PERMITTED_VIOLATION
-	CrlPathValidationError      VerifyResult = C.X509_V_ERR_CRL_PATH_VALIDATION_ERROR
-)
-
-const (
-	NoTLSv1_1 Options = C.SSL_OP_NO_TLSv1_1
-	NoTLSv1_2 Options = C.SSL_OP_NO_TLSv1_2
-)
--- a/sha1.go
+++ b/sha1.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/sha1_test.go
+++ b/sha1_test.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 import (
--- a/sha256.go
+++ b/sha256.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/sha256_test.go
+++ b/sha256_test.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 import (
--- a/ssl.go
+++ b/ssl.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"
--- a/tickets.go
+++ b/tickets.go
@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// +build cgo
-
 package openssl

 // #include "shim.h"