Skip to content

Commit 4bbfd8a

Browse files
authored
removed deprecated functions for rsa gen (#3)
* removed deprecated functions for rsa gen * removed vscode * added vscode to gitignore
1 parent 0880477 commit 4bbfd8a

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
openssl.test
22

3-
vendor
3+
vendor
4+
.vscode

key.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
package openssl
1616

1717
// #include "shim.h"
18+
// #include <openssl/rsa.h>
19+
//EVP_PKEY *evp_rsa_gen(uint bits) {
20+
// return EVP_RSA_gen(bits);
21+
//}
1822
import "C"
1923

2024
import (
@@ -682,23 +686,13 @@ func LoadPublicKeyFromDER(der_block []byte) (PublicKey, error) {
682686

683687
// GenerateRSAKey generates a new RSA private key with an exponent of 3.
684688
func GenerateRSAKey(bits int) (PrivateKey, error) {
685-
return GenerateRSAKeyWithExponent(bits, 3)
689+
return GenerateRSAKeyWithExponent(bits)
686690
}
687691

688692
// GenerateRSAKeyWithExponent generates a new RSA private key.
689-
func GenerateRSAKeyWithExponent(bits int, exponent int) (PrivateKey, error) {
690-
rsa := C.RSA_generate_key(C.int(bits), C.ulong(exponent), nil, nil)
691-
if rsa == nil {
692-
return nil, errors.New("failed to generate RSA key")
693-
}
694-
key := C.X_EVP_PKEY_new()
695-
if key == nil {
696-
return nil, errors.New("failed to allocate EVP_PKEY")
697-
}
698-
if C.X_EVP_PKEY_assign_charp(key, C.EVP_PKEY_RSA, (*C.char)(unsafe.Pointer(rsa))) != 1 {
699-
C.X_EVP_PKEY_free(key)
700-
return nil, errors.New("failed to assign RSA key")
701-
}
693+
// GenerateRSAKeyWithExponent generates a new RSA private key.
694+
func GenerateRSAKeyWithExponent(bits int) (PrivateKey, error) {
695+
key := C.evp_rsa_gen(C.uint(bits))
702696
p := &pKey{key: key}
703697
runtime.SetFinalizer(p, freePKey)
704698
return p, nil

key_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func TestGenerate(t *testing.T) {
153153
if err != nil {
154154
t.Fatal(err)
155155
}
156-
_, err = GenerateRSAKeyWithExponent(1024, 65537)
156+
_, err = GenerateRSAKeyWithExponent(1024)
157157
if err != nil {
158158
t.Fatal(err)
159159
}
@@ -412,7 +412,7 @@ func TestRSAOAEP(t *testing.T) {
412412

413413
t.Run("fail on decrypt with wrong key", func(t *testing.T) {
414414
t.Parallel()
415-
key2, err := GenerateRSAKeyWithExponent(1024, 0x10001)
415+
key2, err := GenerateRSAKeyWithExponent(1024)
416416
if err != nil {
417417
t.Skip("failed to generate extra key")
418418
}

0 commit comments

Comments
 (0)