Skip to content

Commit 401533a

Browse files
oleg-jukovecoleg-jukovec
committed
Fix build by golang 1.13 (#6)
- use unsafe.Pointer instead of *C.void - revert changes from 00b6080
1 parent 0b8ca2a commit 401533a

10 files changed

+48
-41
lines changed

‎alloc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
//export go_ssl_crypto_ex_free
1313
func go_ssl_crypto_ex_free(
14-
parent *C.void, ptr unsafe.Pointer,
14+
parent unsafe.Pointer, ptr unsafe.Pointer,
1515
cryptoData *C.CRYPTO_EX_DATA, idx C.int,
16-
argl C.long, argp *C.void,
16+
argl C.long, argp unsafe.Pointer,
1717
) {
1818
pointer.Unref(ptr)
1919
}

‎build.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// limitations under the License.
1414

1515
//go:build !openssl_static
16+
// +build !openssl_static
1617

1718
package openssl
1819

‎build_static.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// limitations under the License.
1414

1515
//go:build openssl_static
16+
// +build openssl_static
1617

1718
package openssl
1819

‎cert.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import "C"
1919

2020
import (
2121
"errors"
22-
"io"
22+
"io/ioutil"
2323
"math/big"
2424
"runtime"
2525
"time"
@@ -383,7 +383,7 @@ func (c *Certificate) MarshalPEM() (pem_block []byte, err error) {
383383
if int(C.PEM_write_bio_X509(bio, c.x)) != 1 {
384384
return nil, errors.New("failed dumping certificate")
385385
}
386-
return io.ReadAll(asAnyBio(bio))
386+
return ioutil.ReadAll(asAnyBio(bio))
387387
}
388388

389389
// PublicKey returns the public key embedded in the X509 certificate.

‎ctx.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import "C"
2020
import (
2121
"errors"
2222
"fmt"
23+
"io/ioutil"
2324
"os"
2425
"runtime"
2526
"sync"
@@ -120,7 +121,7 @@ func NewCtxFromFiles(cert_file string, key_file string) (*Ctx, error) {
120121
return nil, err
121122
}
122123

123-
cert_bytes, err := os.ReadFile(cert_file)
124+
cert_bytes, err := ioutil.ReadFile(cert_file)
124125
if err != nil {
125126
return nil, err
126127
}
@@ -151,7 +152,7 @@ func NewCtxFromFiles(cert_file string, key_file string) (*Ctx, error) {
151152
}
152153
}
153154

154-
key_bytes, err := os.ReadFile(key_file)
155+
key_bytes, err := ioutil.ReadFile(key_file)
155156
if err != nil {
156157
return nil, err
157158
}

‎init_posix.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// limitations under the License.
1414

1515
//go:build (linux || darwin || solaris || freebsd || openbsd) && !windows
16+
// +build linux darwin solaris freebsd openbsd
17+
// +build !windows
1618

1719
package openssl
1820

‎init_windows.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// limitations under the License.
1414

1515
//go:build windows
16+
// +build windows
1617

1718
package openssl
1819

‎key.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import "C"
1919

2020
import (
2121
"errors"
22-
"io"
22+
"io/ioutil"
2323
"runtime"
2424
"unsafe"
2525
)
@@ -242,7 +242,7 @@ func (key *pKey) MarshalPKCS1PrivateKeyPEM() (pem_block []byte,
242242
return nil, errors.New("failed dumping private key")
243243
}
244244

245-
return io.ReadAll(asAnyBio(bio))
245+
return ioutil.ReadAll(asAnyBio(bio))
246246
}
247247

248248
func (key *pKey) MarshalPKCS1PrivateKeyDER() (der_block []byte,
@@ -257,7 +257,7 @@ func (key *pKey) MarshalPKCS1PrivateKeyDER() (der_block []byte,
257257
return nil, errors.New("failed dumping private key der")
258258
}
259259

260-
return io.ReadAll(asAnyBio(bio))
260+
return ioutil.ReadAll(asAnyBio(bio))
261261
}
262262

263263
func (key *pKey) MarshalPKIXPublicKeyPEM() (pem_block []byte,
@@ -272,7 +272,7 @@ func (key *pKey) MarshalPKIXPublicKeyPEM() (pem_block []byte,
272272
return nil, errors.New("failed dumping public key pem")
273273
}
274274

275-
return io.ReadAll(asAnyBio(bio))
275+
return ioutil.ReadAll(asAnyBio(bio))
276276
}
277277

278278
func (key *pKey) MarshalPKIXPublicKeyDER() (der_block []byte,
@@ -287,7 +287,7 @@ func (key *pKey) MarshalPKIXPublicKeyDER() (der_block []byte,
287287
return nil, errors.New("failed dumping public key der")
288288
}
289289

290-
return io.ReadAll(asAnyBio(bio))
290+
return ioutil.ReadAll(asAnyBio(bio))
291291
}
292292

293293
// LoadPrivateKeyFromPEM loads a private key from a PEM-encoded block.

‎key_test.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"crypto/x509"
2323
"encoding/hex"
2424
pem_pkg "encoding/pem"
25-
"os"
25+
"io/ioutil"
2626
"testing"
2727
)
2828

@@ -51,8 +51,8 @@ func TestMarshal(t *testing.T) {
5151
t.Fatal(err)
5252
}
5353
if !bytes.Equal(pem, certBytes) {
54-
os.WriteFile("generated", pem, 0644)
55-
os.WriteFile("hardcoded", certBytes, 0644)
54+
ioutil.WriteFile("generated", pem, 0644)
55+
ioutil.WriteFile("hardcoded", certBytes, 0644)
5656
t.Fatal("invalid cert pem bytes")
5757
}
5858

@@ -61,8 +61,8 @@ func TestMarshal(t *testing.T) {
6161
t.Fatal(err)
6262
}
6363
if !bytes.Equal(pem, keyBytes) {
64-
os.WriteFile("generated", pem, 0644)
65-
os.WriteFile("hardcoded", keyBytes, 0644)
64+
ioutil.WriteFile("generated", pem, 0644)
65+
ioutil.WriteFile("hardcoded", keyBytes, 0644)
6666
t.Fatal("invalid private key pem bytes")
6767
}
6868
tls_cert, err := tls.X509KeyPair(certBytes, keyBytes)
@@ -94,8 +94,8 @@ func TestMarshal(t *testing.T) {
9494
t.Fatal(err)
9595
}
9696
if !bytes.Equal(der, tls_der) {
97-
os.WriteFile("generated", []byte(hex.Dump(der)), 0644)
98-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
97+
ioutil.WriteFile("generated", []byte(hex.Dump(der)), 0644)
98+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
9999
t.Fatal("invalid public key der bytes")
100100
}
101101

@@ -106,8 +106,8 @@ func TestMarshal(t *testing.T) {
106106
tls_pem := pem_pkg.EncodeToMemory(&pem_pkg.Block{
107107
Type: "PUBLIC KEY", Bytes: tls_der})
108108
if !bytes.Equal(pem, tls_pem) {
109-
os.WriteFile("generated", pem, 0644)
110-
os.WriteFile("hardcoded", tls_pem, 0644)
109+
ioutil.WriteFile("generated", pem, 0644)
110+
ioutil.WriteFile("hardcoded", tls_pem, 0644)
111111
t.Fatal("invalid public key pem bytes")
112112
}
113113

@@ -132,14 +132,14 @@ func TestMarshal(t *testing.T) {
132132
}
133133

134134
if !bytes.Equal(new_der_from_der, tls_der) {
135-
os.WriteFile("generated", []byte(hex.Dump(new_der_from_der)), 0644)
136-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
135+
ioutil.WriteFile("generated", []byte(hex.Dump(new_der_from_der)), 0644)
136+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
137137
t.Fatal("invalid public key der bytes")
138138
}
139139

140140
if !bytes.Equal(new_der_from_pem, tls_der) {
141-
os.WriteFile("generated", []byte(hex.Dump(new_der_from_pem)), 0644)
142-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
141+
ioutil.WriteFile("generated", []byte(hex.Dump(new_der_from_pem)), 0644)
142+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
143143
t.Fatal("invalid public key der bytes")
144144
}
145145
}
@@ -303,8 +303,8 @@ func TestMarshalEC(t *testing.T) {
303303
t.Fatal(err)
304304
}
305305
if !bytes.Equal(pem, prime256v1CertBytes) {
306-
os.WriteFile("generated", pem, 0644)
307-
os.WriteFile("hardcoded", prime256v1CertBytes, 0644)
306+
ioutil.WriteFile("generated", pem, 0644)
307+
ioutil.WriteFile("hardcoded", prime256v1CertBytes, 0644)
308308
t.Fatal("invalid cert pem bytes")
309309
}
310310

@@ -313,8 +313,8 @@ func TestMarshalEC(t *testing.T) {
313313
t.Fatal(err)
314314
}
315315
if !bytes.Equal(pem, prime256v1KeyBytes) {
316-
os.WriteFile("generated", pem, 0644)
317-
os.WriteFile("hardcoded", prime256v1KeyBytes, 0644)
316+
ioutil.WriteFile("generated", pem, 0644)
317+
ioutil.WriteFile("hardcoded", prime256v1KeyBytes, 0644)
318318
t.Fatal("invalid private key pem bytes")
319319
}
320320
tls_cert, err := tls.X509KeyPair(prime256v1CertBytes, prime256v1KeyBytes)
@@ -349,8 +349,8 @@ func TestMarshalEC(t *testing.T) {
349349
t.Fatal(err)
350350
}
351351
if !bytes.Equal(der, tls_der) {
352-
os.WriteFile("generated", []byte(hex.Dump(der)), 0644)
353-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
352+
ioutil.WriteFile("generated", []byte(hex.Dump(der)), 0644)
353+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
354354
t.Fatal("invalid public key der bytes")
355355
}
356356

@@ -361,8 +361,8 @@ func TestMarshalEC(t *testing.T) {
361361
tls_pem := pem_pkg.EncodeToMemory(&pem_pkg.Block{
362362
Type: "PUBLIC KEY", Bytes: tls_der})
363363
if !bytes.Equal(pem, tls_pem) {
364-
os.WriteFile("generated", pem, 0644)
365-
os.WriteFile("hardcoded", tls_pem, 0644)
364+
ioutil.WriteFile("generated", pem, 0644)
365+
ioutil.WriteFile("hardcoded", tls_pem, 0644)
366366
t.Fatal("invalid public key pem bytes")
367367
}
368368

@@ -387,14 +387,14 @@ func TestMarshalEC(t *testing.T) {
387387
}
388388

389389
if !bytes.Equal(new_der_from_der, tls_der) {
390-
os.WriteFile("generated", []byte(hex.Dump(new_der_from_der)), 0644)
391-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
390+
ioutil.WriteFile("generated", []byte(hex.Dump(new_der_from_der)), 0644)
391+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
392392
t.Fatal("invalid public key der bytes")
393393
}
394394

395395
if !bytes.Equal(new_der_from_pem, tls_der) {
396-
os.WriteFile("generated", []byte(hex.Dump(new_der_from_pem)), 0644)
397-
os.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
396+
ioutil.WriteFile("generated", []byte(hex.Dump(new_der_from_pem)), 0644)
397+
ioutil.WriteFile("hardcoded", []byte(hex.Dump(tls_der)), 0644)
398398
t.Fatal("invalid public key der bytes")
399399
}
400400
}
@@ -423,8 +423,8 @@ func TestMarshalEd25519(t *testing.T) {
423423
t.Fatal(err)
424424
}
425425
if !bytes.Equal(pem, ed25519CertBytes) {
426-
os.WriteFile("generated", pem, 0644)
427-
os.WriteFile("hardcoded", ed25519CertBytes, 0644)
426+
ioutil.WriteFile("generated", pem, 0644)
427+
ioutil.WriteFile("hardcoded", ed25519CertBytes, 0644)
428428
t.Fatal("invalid cert pem bytes")
429429
}
430430

‎ssl_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"crypto/rand"
2020
"crypto/tls"
2121
"io"
22+
"io/ioutil"
2223
"net"
2324
"sync"
2425
"testing"
@@ -282,7 +283,7 @@ func ClosingTest(t *testing.T, constructor func(
282283

283284
go func() {
284285
defer wg.Done()
285-
data, err := io.ReadAll(sslconn2)
286+
data, err := ioutil.ReadAll(sslconn2)
286287
if !bytes.Equal(data, []byte("hello")) {
287288
t.Error("bytes don't match")
288289
}
@@ -588,7 +589,7 @@ func LotsOfConns(t *testing.T, payload_size int64, loops, clients int,
588589
}
589590
}()
590591
for i := 0; i < loops; i++ {
591-
_, err := io.Copy(io.Discard,
592+
_, err := io.Copy(ioutil.Discard,
592593
io.LimitReader(conn, payload_size))
593594
if err != nil {
594595
t.Errorf("failed reading: %s", err)
@@ -634,7 +635,7 @@ func LotsOfConns(t *testing.T, payload_size int64, loops, clients int,
634635
t.Errorf("failed writing: %s", err)
635636
return
636637
}
637-
_, err = io.Copy(io.Discard,
638+
_, err = io.Copy(ioutil.Discard,
638639
io.LimitReader(ssl_client, payload_size))
639640
if err != nil {
640641
t.Errorf("failed reading: %s", err)

0 commit comments

Comments
 (0)