Skip to content

Commit eada007

Browse files
qmuntalqmuntal
committed
rename module and remove openssl folder
1 parent 4e5b3fc commit eada007

31 files changed

+14
-15
lines changed

Diff for: ‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
run: sudo sh ./scripts/openssl.sh ${{ matrix.openssl-version }}
2222
- name: Check headers
2323
working-directory: ./cmd/checkheader
24-
run: go run . --ossl-include /usr/local/src/openssl-${{ matrix.openssl-version }}/include -shim ../../openssl/shims.h
24+
run: go run . --ossl-include /usr/local/src/openssl-${{ matrix.openssl-version }}/include -shim ../../shims.h
2525
- name: Set OpenSSL config and prove FIPS
2626
run: |
2727
sudo cp ./scripts/openssl-3.cnf /usr/local/ssl/openssl.cnf
28-
go test -v -count 0 ./openssl | grep -q "FIPS enabled: true"
28+
go test -v -count 0 . | grep -q "FIPS enabled: true"
2929
if: ${{ matrix.openssl-version == '3.0.1' }}
3030
env:
3131
GO_OPENSSL_VERSION_OVERRIDE: ${{ matrix.openssl-version }}

Diff for: ‎openssl/aes.go renamed to ‎aes.go

File renamed without changes.

Diff for: ‎openssl/aes_test.go renamed to ‎aes_test.go

File renamed without changes.

Diff for: ‎openssl/bbig/big.go renamed to ‎bbig/big.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"math/big"
1212
"unsafe"
1313

14-
"github.com/golang-fips/openssl-fips/openssl"
14+
"github.com/golang-fips/openssl"
1515
)
1616

1717
func Enc(b *big.Int) openssl.BigInt {

Diff for: ‎openssl/big.go renamed to ‎big.go

File renamed without changes.

Diff for: ‎cmd/checkheader/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

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

Diff for: ‎openssl/ec.go renamed to ‎ec.go

File renamed without changes.

Diff for: ‎openssl/ecdh.go renamed to ‎ecdh.go

File renamed without changes.

Diff for: ‎openssl/ecdh_test.go renamed to ‎ecdh_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"encoding/hex"
99
"testing"
1010

11-
"github.com/golang-fips/openssl-fips/openssl"
11+
"github.com/golang-fips/openssl"
1212
)
1313

1414
func TestECDH(t *testing.T) {

Diff for: ‎openssl/ecdsa.go renamed to ‎ecdsa.go

File renamed without changes.

Diff for: ‎openssl/ecdsa_test.go renamed to ‎ecdsa_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"crypto/elliptic"
1010
"testing"
1111

12-
"github.com/golang-fips/openssl-fips/openssl"
13-
"github.com/golang-fips/openssl-fips/openssl/bbig"
12+
"github.com/golang-fips/openssl"
13+
"github.com/golang-fips/openssl/bbig"
1414
)
1515

1616
func testAllCurves(t *testing.T, f func(*testing.T, elliptic.Curve)) {

Diff for: ‎openssl/evp.go renamed to ‎evp.go

File renamed without changes.

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module github.com/golang-fips/openssl-fips
1+
module github.com/golang-fips/openssl
22

33
go 1.18

Diff for: ‎openssl/goopenssl.c renamed to ‎goopenssl.c

File renamed without changes.

Diff for: ‎openssl/goopenssl.h renamed to ‎goopenssl.h

File renamed without changes.

Diff for: ‎openssl/hkdf.go renamed to ‎hkdf.go

File renamed without changes.

Diff for: ‎openssl/hkdf_test.go renamed to ‎hkdf_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"bytes"
88
"testing"
99

10-
"github.com/golang-fips/openssl-fips/openssl"
10+
"github.com/golang-fips/openssl"
1111
)
1212

1313
func TestExtractHKDF(t *testing.T) {
@@ -70,4 +70,3 @@ func TestExpandHKDF(t *testing.T) {
7070
t.Errorf("OKM doesn't match\ngot: %#v\nexp: %#v", buf, expected)
7171
}
7272
}
73-

Diff for: ‎openssl/hmac.go renamed to ‎hmac.go

File renamed without changes.

Diff for: ‎openssl/hmac_test.go renamed to ‎hmac_test.go

File renamed without changes.

Diff for: ‎openssl/init.go renamed to ‎init.go

File renamed without changes.

Diff for: ‎openssl/openssl.go renamed to ‎openssl.go

File renamed without changes.

Diff for: ‎openssl/openssl_test.go renamed to ‎openssl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/golang-fips/openssl-fips/openssl"
13+
"github.com/golang-fips/openssl"
1414
)
1515

1616
// getVersion returns the OpenSSL version to use for testing.

Diff for: ‎openssl/port_evp_md5_sha1.c renamed to ‎port_evp_md5_sha1.c

File renamed without changes.

Diff for: ‎openssl/rand.go renamed to ‎rand.go

File renamed without changes.

Diff for: ‎openssl/rand_test.go renamed to ‎rand_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package openssl_test
66
import (
77
"testing"
88

9-
"github.com/golang-fips/openssl-fips/openssl"
9+
"github.com/golang-fips/openssl"
1010
)
1111

1212
func TestRand(t *testing.T) {

Diff for: ‎openssl/rsa.go renamed to ‎rsa.go

File renamed without changes.

Diff for: ‎openssl/rsa_test.go renamed to ‎rsa_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"strconv"
1212
"testing"
1313

14-
"github.com/golang-fips/openssl-fips/openssl"
15-
"github.com/golang-fips/openssl-fips/openssl/bbig"
14+
"github.com/golang-fips/openssl"
15+
"github.com/golang-fips/openssl/bbig"
1616
)
1717

1818
func TestRSAKeyGeneration(t *testing.T) {

Diff for: ‎openssl/sha.go renamed to ‎sha.go

File renamed without changes.

Diff for: ‎openssl/sha_test.go renamed to ‎sha_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"io"
1111
"testing"
1212

13-
"github.com/golang-fips/openssl-fips/openssl"
13+
"github.com/golang-fips/openssl"
1414
)
1515

1616
func TestSha(t *testing.T) {

Diff for: ‎openssl/shims.h renamed to ‎shims.h

File renamed without changes.

Diff for: ‎openssl/thread_setup.c renamed to ‎thread_setup.c

File renamed without changes.

0 commit comments

Comments
 (0)