Skip to content

Commit 19bd1fa

Browse files
p-steuerp-steuer
committed
s390x assembly pack: accelerate X25519, X448, Ed25519 and Ed448
using PCC and KDSA instructions. Signed-off-by: Patrick Steuer <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (Merged from #10004)
1 parent 2281be2 commit 19bd1fa

20 files changed

+914
-76
lines changed

‎CHANGES

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
1111

12+
*) s390x assembly pack: add hardware-support for P-256, P-384, P-521,
13+
X25519, X448, Ed25519 and Ed448.
14+
[Patrick Steuer]
15+
1216
*) Print all values for a PKCS#12 attribute with 'openssl pkcs12', not just
1317
the first value.
1418
[Jon Spillett]

‎crypto/dh/dh_pmeth.c

+12-2
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
478478
return 0;
479479
}
480480

481-
const EVP_PKEY_METHOD dh_pkey_meth = {
481+
static const EVP_PKEY_METHOD dh_pkey_meth = {
482482
EVP_PKEY_DH,
483483
0,
484484
pkey_dh_init,
@@ -512,7 +512,12 @@ const EVP_PKEY_METHOD dh_pkey_meth = {
512512
pkey_dh_ctrl_str
513513
};
514514

515-
const EVP_PKEY_METHOD dhx_pkey_meth = {
515+
const EVP_PKEY_METHOD *dh_pkey_method(void)
516+
{
517+
return &dh_pkey_meth;
518+
}
519+
520+
static const EVP_PKEY_METHOD dhx_pkey_meth = {
516521
EVP_PKEY_DHX,
517522
0,
518523
pkey_dh_init,
@@ -545,3 +550,8 @@ const EVP_PKEY_METHOD dhx_pkey_meth = {
545550
pkey_dh_ctrl,
546551
pkey_dh_ctrl_str
547552
};
553+
554+
const EVP_PKEY_METHOD *dhx_pkey_method(void)
555+
{
556+
return &dhx_pkey_meth;
557+
}

‎crypto/dsa/dsa_pmeth.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ static int pkey_dsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
239239
return DSA_generate_key(pkey->pkey.dsa);
240240
}
241241

242-
const EVP_PKEY_METHOD dsa_pkey_meth = {
242+
static const EVP_PKEY_METHOD dsa_pkey_meth = {
243243
EVP_PKEY_DSA,
244244
EVP_PKEY_FLAG_AUTOARGLEN,
245245
pkey_dsa_init,
@@ -271,3 +271,8 @@ const EVP_PKEY_METHOD dsa_pkey_meth = {
271271
pkey_dsa_ctrl,
272272
pkey_dsa_ctrl_str
273273
};
274+
275+
const EVP_PKEY_METHOD *dsa_pkey_method(void)
276+
{
277+
return &dsa_pkey_meth;
278+
}

‎crypto/ec/build.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IF[{- !$disabled{asm} -}]
1919
$ECASM_mips64=
2020

2121
$ECASM_s390x=ecp_s390x_nistp.c
22-
$ECDEF_s390x=S390X_NISTP_ASM
22+
$ECDEF_s390x=S390X_EC_ASM
2323

2424
$ECASM_armv4=ecp_nistz256.c ecp_nistz256-armv4.S
2525
$ECDEF_armv4=ECP_NISTZ256_ASM

‎crypto/ec/ec_curve.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -2829,15 +2829,15 @@ static const ec_list_element curve_list[] = {
28292829
# endif
28302830
/* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
28312831
{NID_secp384r1, &_EC_NIST_PRIME_384.h,
2832-
# if defined(S390X_NISTP_ASM)
2832+
# if defined(S390X_EC_ASM)
28332833
EC_GFp_s390x_nistp384_method,
28342834
# else
28352835
0,
28362836
# endif
28372837
"NIST/SECG curve over a 384 bit prime field"},
28382838

28392839
{NID_secp521r1, &_EC_NIST_PRIME_521.h,
2840-
# if defined(S390X_NISTP_ASM)
2840+
# if defined(S390X_EC_ASM)
28412841
EC_GFp_s390x_nistp521_method,
28422842
# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
28432843
EC_GFp_nistp521_method,
@@ -2852,7 +2852,7 @@ static const ec_list_element curve_list[] = {
28522852
{NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
28532853
# if defined(ECP_NISTZ256_ASM)
28542854
EC_GFp_nistz256_method,
2855-
# elif defined(S390X_NISTP_ASM)
2855+
# elif defined(S390X_EC_ASM)
28562856
EC_GFp_s390x_nistp256_method,
28572857
# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
28582858
EC_GFp_nistp256_method,
@@ -2922,14 +2922,14 @@ static const ec_list_element curve_list[] = {
29222922
"SECG curve over a 256 bit prime field"},
29232923
/* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
29242924
{NID_secp384r1, &_EC_NIST_PRIME_384.h,
2925-
# if defined(S390X_NISTP_ASM)
2925+
# if defined(S390X_EC_ASM)
29262926
EC_GFp_s390x_nistp384_method,
29272927
# else
29282928
0,
29292929
# endif
29302930
"NIST/SECG curve over a 384 bit prime field"},
29312931
{NID_secp521r1, &_EC_NIST_PRIME_521.h,
2932-
# if defined(S390X_NISTP_ASM)
2932+
# if defined(S390X_EC_ASM)
29332933
EC_GFp_s390x_nistp521_method,
29342934
# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
29352935
EC_GFp_nistp521_method,
@@ -2953,7 +2953,7 @@ static const ec_list_element curve_list[] = {
29532953
{NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
29542954
# if defined(ECP_NISTZ256_ASM)
29552955
EC_GFp_nistz256_method,
2956-
# elif defined(S390X_NISTP_ASM)
2956+
# elif defined(S390X_EC_ASM)
29572957
EC_GFp_s390x_nistp256_method,
29582958
# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
29592959
EC_GFp_nistp256_method,

‎crypto/ec/ec_lcl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ int ec_group_simple_order_bits(const EC_GROUP *group);
597597
*/
598598
const EC_METHOD *EC_GFp_nistz256_method(void);
599599
#endif
600-
#ifdef S390X_NISTP_ASM
600+
#ifdef S390X_EC_ASM
601601
const EC_METHOD *EC_GFp_s390x_nistp256_method(void);
602602
const EC_METHOD *EC_GFp_s390x_nistp384_method(void);
603603
const EC_METHOD *EC_GFp_s390x_nistp521_method(void);

‎crypto/ec/ec_pmeth.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ static int pkey_ec_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
437437
return ret ? EC_KEY_generate_key(ec) : 0;
438438
}
439439

440-
const EVP_PKEY_METHOD ec_pkey_meth = {
440+
static const EVP_PKEY_METHOD ec_pkey_meth = {
441441
EVP_PKEY_EC,
442442
0,
443443
pkey_ec_init,
@@ -475,3 +475,8 @@ const EVP_PKEY_METHOD ec_pkey_meth = {
475475
pkey_ec_ctrl,
476476
pkey_ec_ctrl_str
477477
};
478+
479+
const EVP_PKEY_METHOD *ec_pkey_method(void)
480+
{
481+
return &ec_pkey_meth;
482+
}

0 commit comments

Comments
 (0)