Skip to content

Commit 337e794

Browse files
qmuntalqmuntal
committed
use the OpenSSL parameter names as variable names
1 parent 6f4d87d commit 337e794

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎ec.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ package openssl
66
import "C"
77

88
var (
9-
paramPubKey = C.CString("pub")
10-
paramPrivKey = C.CString("priv")
11-
paramGroup = C.CString("group")
12-
paramECPubX = C.CString("qx")
13-
paramECPubY = C.CString("qy")
9+
OSSL_PKEY_PARAM_PUB_KEY = C.CString("pub")
10+
OSSL_PKEY_PARAM_PRIV_KEY = C.CString("priv")
11+
OSSL_PKEY_PARAM_GROUP_NAME = C.CString("group")
12+
OSSL_PKEY_PARAM_EC_PUB_X = C.CString("qx")
13+
OSSL_PKEY_PARAM_EC_PUB_Y = C.CString("qy")
1414
)
1515

1616
func curveNID(curve string) (C.int, error) {

‎ecdh.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,22 @@ func newECDHPkey3(nid C.int, bytes []byte, isPrivate bool) (C.GO_EVP_PKEY_PTR, e
174174
return nil, newOpenSSLError("OSSL_PARAM_BLD_new")
175175
}
176176
defer C.go_openssl_OSSL_PARAM_BLD_free(bld)
177-
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, paramGroup, C.go_openssl_OBJ_nid2sn(nid), 0)
177+
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME, C.go_openssl_OBJ_nid2sn(nid), 0)
178178
var selection C.int
179179
if isPrivate {
180180
priv := C.go_openssl_BN_bin2bn(base(bytes), C.int(len(bytes)), nil)
181181
if priv == nil {
182182
return nil, newOpenSSLError("BN_bin2bn")
183183
}
184184
defer C.go_openssl_BN_clear_free(priv)
185-
if C.go_openssl_OSSL_PARAM_BLD_push_BN(bld, paramPrivKey, priv) != 1 {
185+
if C.go_openssl_OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, priv) != 1 {
186186
return nil, newOpenSSLError("OSSL_PARAM_BLD_push_BN")
187187
}
188188
selection = C.GO_EVP_PKEY_KEYPAIR
189189
} else {
190190
cbytes := C.CBytes(bytes)
191191
defer C.free(cbytes)
192-
C.go_openssl_OSSL_PARAM_BLD_push_octet_string(bld, paramPubKey, cbytes, C.size_t(len(bytes)))
192+
C.go_openssl_OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY, cbytes, C.size_t(len(bytes)))
193193
selection = C.GO_EVP_PKEY_PUBLIC_KEY
194194
}
195195
params := C.go_openssl_OSSL_PARAM_BLD_to_param(bld)
@@ -235,7 +235,7 @@ func deriveEcdhPublicKey(pkey C.GO_EVP_PKEY_PTR, curve string) error {
235235
}
236236
case 3:
237237
var priv C.GO_BIGNUM_PTR
238-
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, paramPrivKey, &priv) != 1 {
238+
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv) != 1 {
239239
return newOpenSSLError("EVP_PKEY_get_bn_param")
240240
}
241241
defer C.go_openssl_BN_clear_free(priv)
@@ -300,7 +300,7 @@ func GenerateKeyECDH(curve string) (*PrivateKeyECDH, []byte, error) {
300300
return nil, nil, newOpenSSLError("EC_KEY_get0_private_key")
301301
}
302302
case 3:
303-
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, paramPrivKey, &priv) != 1 {
303+
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv) != 1 {
304304
return nil, nil, newOpenSSLError("EVP_PKEY_get_bn_param")
305305
}
306306
defer C.go_openssl_BN_clear_free(priv)

‎ecdsa.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ func GenerateKeyECDSA(curve string) (X, Y, D BigInt, err error) {
9191
// Get Z. We don't need to free it, get0 does not increase the reference count.
9292
bd = C.go_openssl_EC_KEY_get0_private_key(key)
9393
case 3:
94-
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, paramECPubX, &bx) != 1 ||
95-
C.go_openssl_EVP_PKEY_get_bn_param(pkey, paramECPubY, &by) != 1 ||
96-
C.go_openssl_EVP_PKEY_get_bn_param(pkey, paramPrivKey, &bd) != 1 {
94+
if C.go_openssl_EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_EC_PUB_X, &bx) != 1 ||
95+
C.go_openssl_EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_EC_PUB_Y, &by) != 1 ||
96+
C.go_openssl_EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &bd) != 1 {
9797
return nil, nil, nil, newOpenSSLError("EVP_PKEY_get_bn_param")
9898
}
9999
defer C.go_openssl_BN_clear_free(bd)
@@ -195,13 +195,13 @@ func newECDSAKey3(nid C.int, bx, by, bd C.GO_BIGNUM_PTR) (C.GO_EVP_PKEY_PTR, err
195195
return nil, newOpenSSLError("OSSL_PARAM_BLD_new")
196196
}
197197
defer C.go_openssl_OSSL_PARAM_BLD_free(bld)
198-
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, paramGroup, C.go_openssl_OBJ_nid2sn(nid), 0)
198+
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME, C.go_openssl_OBJ_nid2sn(nid), 0)
199199
cbytes := C.CBytes(pubBytes)
200200
defer C.free(cbytes)
201-
C.go_openssl_OSSL_PARAM_BLD_push_octet_string(bld, paramPubKey, cbytes, C.size_t(len(pubBytes)))
201+
C.go_openssl_OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY, cbytes, C.size_t(len(pubBytes)))
202202
var selection C.int
203203
if bd != nil {
204-
if C.go_openssl_OSSL_PARAM_BLD_push_BN(bld, paramPrivKey, bd) != 1 {
204+
if C.go_openssl_OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, bd) != 1 {
205205
return nil, newOpenSSLError("OSSL_PARAM_BLD_push_BN")
206206
}
207207
selection = C.GO_EVP_PKEY_KEYPAIR

‎hmac.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"unsafe"
1212
)
1313

14-
var paramDigest = C.CString("digest")
14+
var OSSL_MAC_PARAM_DIGEST = C.CString("digest")
1515

1616
var (
1717
fetchHMACOnce sync.Once
@@ -103,7 +103,7 @@ func newHMAC3(key []byte, h hash.Hash, md C.GO_EVP_MD_PTR) *opensslHMAC {
103103
panic(newOpenSSLError("OSSL_PARAM_BLD_new"))
104104
}
105105
defer C.go_openssl_OSSL_PARAM_BLD_free(bld)
106-
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, paramDigest, digest, 0)
106+
C.go_openssl_OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_MAC_PARAM_DIGEST, digest, 0)
107107
params := C.go_openssl_OSSL_PARAM_BLD_to_param(bld)
108108
if params == nil {
109109
panic(newOpenSSLError("OSSL_PARAM_BLD_to_param"))

‎rsa.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import (
1414
)
1515

1616
var (
17-
paramRSA_N = C.CString("n")
18-
paramRSA_E = C.CString("e")
19-
paramRSA_D = C.CString("d")
20-
paramRSA_P = C.CString("rsa-factor1")
21-
paramRSA_Q = C.CString("rsa-factor2")
22-
paramRSA_Dp = C.CString("rsa-exponent1")
23-
paramRSA_Dq = C.CString("rsa-exponent2")
24-
paramRSA_Qinv = C.CString("rsa-coefficient1")
17+
OSSL_PKEY_PARAM_RSA_N = C.CString("n")
18+
OSSL_PKEY_PARAM_RSA_E = C.CString("e")
19+
OSSL_PKEY_PARAM_RSA_D = C.CString("d")
20+
OSSL_PKEY_PARAM_RSA_FACTOR1 = C.CString("rsa-factor1")
21+
OSSL_PKEY_PARAM_RSA_FACTOR2 = C.CString("rsa-factor2")
22+
OSSL_PKEY_PARAM_RSA_EXPONENT1 = C.CString("rsa-exponent1")
23+
OSSL_PKEY_PARAM_RSA_EXPONENT2 = C.CString("rsa-exponent2")
24+
OSSL_PKEY_PARAM_RSA_COEFFICIENT1 = C.CString("rsa-coefficient1")
2525
)
2626

2727
func GenerateKeyRSA(bits int) (N, E, D, P, Q, Dp, Dq, Qinv BigInt, err error) {
@@ -73,14 +73,14 @@ func GenerateKeyRSA(bits int) (N, E, D, P, Q, Dp, Dq, Qinv BigInt, err error) {
7373
C.go_openssl_BN_clear(tmp)
7474
return true
7575
}
76-
if !(setBigInt(&N, paramRSA_N) &&
77-
setBigInt(&E, paramRSA_E) &&
78-
setBigInt(&D, paramRSA_D) &&
79-
setBigInt(&P, paramRSA_P) &&
80-
setBigInt(&Q, paramRSA_Q) &&
81-
setBigInt(&Dp, paramRSA_Dp) &&
82-
setBigInt(&Dq, paramRSA_Dq) &&
83-
setBigInt(&Qinv, paramRSA_Qinv)) {
76+
if !(setBigInt(&N, OSSL_PKEY_PARAM_RSA_N) &&
77+
setBigInt(&E, OSSL_PKEY_PARAM_RSA_E) &&
78+
setBigInt(&D, OSSL_PKEY_PARAM_RSA_D) &&
79+
setBigInt(&P, OSSL_PKEY_PARAM_RSA_FACTOR1) &&
80+
setBigInt(&Q, OSSL_PKEY_PARAM_RSA_FACTOR2) &&
81+
setBigInt(&Dp, OSSL_PKEY_PARAM_RSA_EXPONENT1) &&
82+
setBigInt(&Dq, OSSL_PKEY_PARAM_RSA_EXPONENT2) &&
83+
setBigInt(&Qinv, OSSL_PKEY_PARAM_RSA_COEFFICIENT1)) {
8484
return bad(err)
8585
}
8686
default:
@@ -385,15 +385,15 @@ func newRSAKey3(isPriv bool, N, E, D, P, Q, Dp, Dq, Qinv BigInt) (C.GO_EVP_PKEY_
385385
}
386386
defer C.go_openssl_OSSL_PARAM_BLD_free(bld)
387387

388-
type bigIntParam struct{
388+
type bigIntParam struct {
389389
name *C.char
390390
num BigInt
391391
}
392392

393393
comps := make([]bigIntParam, 0, 8)
394394

395395
required := [...]bigIntParam{
396-
{paramRSA_N, N}, {paramRSA_E, E}, {paramRSA_D, D},
396+
{OSSL_PKEY_PARAM_RSA_N, N}, {OSSL_PKEY_PARAM_RSA_E, E}, {OSSL_PKEY_PARAM_RSA_D, D},
397397
}
398398
comps = append(comps, required[:]...)
399399

@@ -402,8 +402,8 @@ func newRSAKey3(isPriv bool, N, E, D, P, Q, Dp, Dq, Qinv BigInt) (C.GO_EVP_PKEY_
402402
// https://github.com/openssl/openssl/pull/22334
403403
if P != nil && Q != nil && Dp != nil && Dq != nil && Qinv != nil {
404404
precomputed := [...]bigIntParam{
405-
{paramRSA_P, P}, {paramRSA_Q, Q},
406-
{paramRSA_Dp, Dp}, {paramRSA_Dq, Dq}, {paramRSA_Qinv, Qinv},
405+
{OSSL_PKEY_PARAM_RSA_FACTOR1, P}, {OSSL_PKEY_PARAM_RSA_FACTOR2, Q},
406+
{OSSL_PKEY_PARAM_RSA_EXPONENT1, Dp}, {OSSL_PKEY_PARAM_RSA_EXPONENT2, Dq}, {OSSL_PKEY_PARAM_RSA_COEFFICIENT1, Qinv},
407407
}
408408
comps = append(comps, precomputed[:]...)
409409
}

0 commit comments

Comments
 (0)