rename module and remove openssl folder

Author: qmuntal

.github/workflows/test.yml

@@ -21,11 +21,11 @@ jobs:
       run: sudo sh ./scripts/openssl.sh ${{ matrix.openssl-version }}
     - name: Check headers
       working-directory: ./cmd/checkheader
-      run: go run . --ossl-include /usr/local/src/openssl-${{ matrix.openssl-version }}/include -shim ../../openssl/shims.h
+      run: go run . --ossl-include /usr/local/src/openssl-${{ matrix.openssl-version }}/include -shim ../../shims.h
     - name: Set OpenSSL config and prove FIPS
       run: |
         sudo cp ./scripts/openssl-3.cnf /usr/local/ssl/openssl.cnf
-        go test -v -count 0 ./openssl | grep -q "FIPS enabled: true"
+        go test -v -count 0 . | grep -q "FIPS enabled: true"
       if: ${{ matrix.openssl-version == '3.0.1' }}
       env:
         GO_OPENSSL_VERSION_OVERRIDE: ${{ matrix.openssl-version }}

openssl/aes.go renamed to aes.go

@@ -11,7 +11,7 @@ import (
 	"math/big"
 	"unsafe"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 func Enc(b *big.Int) openssl.BigInt {

openssl/aes_test.go renamed to aes_test.go

@@ -29,7 +29,7 @@ import (
 
 const description = `
 Example: A check operation:
-  go run ./cmd/checkheader --ossl-include /usr/local/src/openssl-1.1.1/include -shim ./openssl/shims.h 
+  go run ./cmd/checkheader --ossl-include /usr/local/src/openssl-1.1.1/include -shim ./shims.h 
 Checkheader generates a C program and compiles it with gcc. The compilation verifies types and functions defined in the target
 header file match the definitions in --ossl-include.
 `

openssl/bbig/big.go renamed to bbig/big.go

@@ -8,7 +8,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 func TestECDH(t *testing.T) {

openssl/big.go renamed to big.go

@@ -9,8 +9,8 @@ import (
 	"crypto/elliptic"
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
-	"github.com/golang-fips/openssl-fips/openssl/bbig"
+	"github.com/golang-fips/openssl"
+	"github.com/golang-fips/openssl/bbig"
 )
 
 func testAllCurves(t *testing.T, f func(*testing.T, elliptic.Curve)) {

cmd/checkheader/main.go

@@ -1,3 +1,3 @@
-module github.com/golang-fips/openssl-fips
+module github.com/golang-fips/openssl
 
 go 1.18

openssl/ec.go renamed to ec.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 func TestExtractHKDF(t *testing.T) {
@@ -70,4 +70,3 @@ func TestExpandHKDF(t *testing.T) {
 		t.Errorf("OKM doesn't match\ngot: %#v\nexp: %#v", buf, expected)
 	}
 }
-

openssl/ecdh.go renamed to ecdh.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 // getVersion returns the OpenSSL version to use for testing.

openssl/ecdh_test.go renamed to ecdh_test.go

@@ -6,7 +6,7 @@ package openssl_test
 import (
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 func TestRand(t *testing.T) {

openssl/ecdsa.go renamed to ecdsa.go

@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
-	"github.com/golang-fips/openssl-fips/openssl/bbig"
+	"github.com/golang-fips/openssl"
+	"github.com/golang-fips/openssl/bbig"
 )
 
 func TestRSAKeyGeneration(t *testing.T) {

openssl/ecdsa_test.go renamed to ecdsa_test.go

@@ -10,7 +10,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/golang-fips/openssl-fips/openssl"
+	"github.com/golang-fips/openssl"
 )
 
 func TestSha(t *testing.T) {