Skip to content

Commit

Permalink
Rebase golang-fips/openssl to latest v1
Browse files Browse the repository at this point in the history
  • Loading branch information
dbenoit17 committed Aug 30, 2024
1 parent 2fb5e90 commit 0a95d08
Show file tree
Hide file tree
Showing 6 changed files with 944 additions and 409 deletions.
2 changes: 1 addition & 1 deletion config/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"github.com/golang-fips/go": "go1.20-fips-release",
"github.com/golang-fips/openssl-fips": "344578cb6bab24f4b1e04b7845502820d697d2c3",
"github.com/golang-fips/openssl-fips": "972af39412e2517625d69b4d79c439eab52ba6c9",
"github.com/golang/go": "go1.20.12"
}
12 changes: 6 additions & 6 deletions patches/000-initial-setup.patch
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ index 0000000000..c0800df578
+ "math/big"
+ "unsafe"
+
+ "github.com/golang-fips/openssl-fips/openssl"
+ "github.com/golang-fips/openssl/openssl"
+)
+
+func Enc(b *big.Int) openssl.BigInt {
Expand Down Expand Up @@ -366,7 +366,7 @@ index 0000000000..15c1ee8cbe
+ "crypto/cipher"
+ "crypto/internal/boring/sig"
+ "math/big"
+ "github.com/golang-fips/openssl-fips/openssl"
+ "github.com/golang-fips/openssl/openssl"
+ "hash"
+ "io"
+)
Expand Down Expand Up @@ -534,7 +534,7 @@ index 0000000000..2087c555a4
+package backend
+
+import (
+ "github.com/golang-fips/openssl-fips/openssl"
+ "github.com/golang-fips/openssl/openssl"
+)
+
+// Enabled controls whether FIPS crypto is enabled.
Expand Down Expand Up @@ -1577,7 +1577,7 @@ index 08452c7b1d..0732db0662 100644
+ fmt, crypto/cipher,
crypto/internal/boring/bcache
< crypto/internal/boring
+ < github.com/golang-fips/openssl-fips/openssl
+ < github.com/golang-fips/openssl/openssl
+ < crypto/internal/backend
< crypto/boring;

Expand All @@ -1591,7 +1591,7 @@ index 08452c7b1d..0732db0662 100644

# CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok.
CRYPTO, FMT, math/big
+ < github.com/golang-fips/openssl-fips/openssl/bbig
+ < github.com/golang-fips/openssl/openssl/bbig
< crypto/internal/boring/bbig
+ < crypto/internal/backend/bbig
< crypto/rand
Expand Down Expand Up @@ -1619,7 +1619,7 @@ index 08452c7b1d..0732db0662 100644
var imports []string
var haveImport = map[string]bool{}
- if pkg == "crypto/internal/boring" {
+ if pkg == "crypto/internal/boring" || pkg == "github.com/golang-fips/openssl-fips/openssl" {
+ if pkg == "crypto/internal/boring" || pkg == "github.com/golang-fips/openssl/openssl" {
haveImport["C"] = true // kludge: prevent C from appearing in crypto/internal/boring imports
}
fset := token.NewFileSet()
Expand Down
Loading

0 comments on commit 0a95d08

Please sign in to comment.