Latest update.
This commit is contained in:
+672
-8
@@ -12,10 +12,10 @@
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/ec.h>
|
||||
#include <openssl/rand.h>
|
||||
#include "internal/asn1_int.h"
|
||||
#include "internal/evp_int.h"
|
||||
#include "ec_lcl.h"
|
||||
#include "curve448/curve448_lcl.h"
|
||||
#include "crypto/asn1.h"
|
||||
#include "crypto/evp.h"
|
||||
#include "ec_local.h"
|
||||
#include "curve448/curve448_local.h"
|
||||
|
||||
#define X25519_BITS 253
|
||||
#define X25519_SECURITY_BITS 128
|
||||
@@ -719,7 +719,7 @@ static int pkey_ecx_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
||||
return -2;
|
||||
}
|
||||
|
||||
const EVP_PKEY_METHOD ecx25519_pkey_meth = {
|
||||
static const EVP_PKEY_METHOD ecx25519_pkey_meth = {
|
||||
EVP_PKEY_X25519,
|
||||
0, 0, 0, 0, 0, 0, 0,
|
||||
pkey_ecx_keygen,
|
||||
@@ -729,7 +729,7 @@ const EVP_PKEY_METHOD ecx25519_pkey_meth = {
|
||||
0
|
||||
};
|
||||
|
||||
const EVP_PKEY_METHOD ecx448_pkey_meth = {
|
||||
static const EVP_PKEY_METHOD ecx448_pkey_meth = {
|
||||
EVP_PKEY_X448,
|
||||
0, 0, 0, 0, 0, 0, 0,
|
||||
pkey_ecx_keygen,
|
||||
@@ -830,7 +830,7 @@ static int pkey_ecd_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
||||
return -2;
|
||||
}
|
||||
|
||||
const EVP_PKEY_METHOD ed25519_pkey_meth = {
|
||||
static const EVP_PKEY_METHOD ed25519_pkey_meth = {
|
||||
EVP_PKEY_ED25519, EVP_PKEY_FLAG_SIGCTX_CUSTOM,
|
||||
0, 0, 0, 0, 0, 0,
|
||||
pkey_ecx_keygen,
|
||||
@@ -841,7 +841,7 @@ const EVP_PKEY_METHOD ed25519_pkey_meth = {
|
||||
pkey_ecd_digestverify25519
|
||||
};
|
||||
|
||||
const EVP_PKEY_METHOD ed448_pkey_meth = {
|
||||
static const EVP_PKEY_METHOD ed448_pkey_meth = {
|
||||
EVP_PKEY_ED448, EVP_PKEY_FLAG_SIGCTX_CUSTOM,
|
||||
0, 0, 0, 0, 0, 0,
|
||||
pkey_ecx_keygen,
|
||||
@@ -851,3 +851,667 @@ const EVP_PKEY_METHOD ed448_pkey_meth = {
|
||||
pkey_ecd_digestsign448,
|
||||
pkey_ecd_digestverify448
|
||||
};
|
||||
|
||||
#ifdef S390X_EC_ASM
|
||||
# include "s390x_arch.h"
|
||||
|
||||
static void s390x_x25519_mod_p(unsigned char u[32])
|
||||
{
|
||||
unsigned char u_red[32];
|
||||
unsigned int c = 0;
|
||||
int i;
|
||||
|
||||
memcpy(u_red, u, sizeof(u_red));
|
||||
|
||||
c += (unsigned int)u_red[31] + 19;
|
||||
u_red[31] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
|
||||
for (i = 30; c > 0 && i >= 0; i--) {
|
||||
c += (unsigned int)u_red[i];
|
||||
u_red[i] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
}
|
||||
|
||||
if (u_red[0] & 0x80) {
|
||||
u_red[0] &= 0x7f;
|
||||
memcpy(u, u_red, sizeof(u_red));
|
||||
}
|
||||
}
|
||||
|
||||
static void s390x_x448_mod_p(unsigned char u[56])
|
||||
{
|
||||
unsigned char u_red[56];
|
||||
unsigned int c = 0;
|
||||
int i;
|
||||
|
||||
memcpy(u_red, u, sizeof(u_red));
|
||||
|
||||
c += (unsigned int)u_red[55] + 1;
|
||||
u_red[55] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
|
||||
for (i = 54; i >= 28; i--) {
|
||||
c += (unsigned int)u_red[i];
|
||||
u_red[i] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
}
|
||||
|
||||
c += (unsigned int)u_red[27] + 1;
|
||||
u_red[27] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
|
||||
for (i = 26; c > 0 && i >= 0; i--) {
|
||||
c += (unsigned int)u_red[i];
|
||||
u_red[i] = (unsigned char)c;
|
||||
c >>= 8;
|
||||
}
|
||||
|
||||
if (u_red[0] & 0x80) {
|
||||
u_red[0] &= 0x7f;
|
||||
memcpy(u, u_red, sizeof(u_red));
|
||||
}
|
||||
}
|
||||
|
||||
static int s390x_x25519_mul(unsigned char u_dst[32],
|
||||
const unsigned char u_src[32],
|
||||
const unsigned char d_src[32])
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char u_dst[32];
|
||||
unsigned char u_src[32];
|
||||
unsigned char d_src[32];
|
||||
} x25519;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
int rc;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
|
||||
s390x_flip_endian32(param.x25519.u_src, u_src);
|
||||
param.x25519.u_src[0] &= 0x7f;
|
||||
s390x_x25519_mod_p(param.x25519.u_src);
|
||||
|
||||
s390x_flip_endian32(param.x25519.d_src, d_src);
|
||||
param.x25519.d_src[31] &= 248;
|
||||
param.x25519.d_src[0] &= 127;
|
||||
param.x25519.d_src[0] |= 64;
|
||||
|
||||
rc = s390x_pcc(S390X_SCALAR_MULTIPLY_X25519, ¶m.x25519) ? 0 : 1;
|
||||
if (rc == 1)
|
||||
s390x_flip_endian32(u_dst, param.x25519.u_dst);
|
||||
|
||||
OPENSSL_cleanse(param.x25519.d_src, sizeof(param.x25519.d_src));
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int s390x_x448_mul(unsigned char u_dst[56],
|
||||
const unsigned char u_src[56],
|
||||
const unsigned char d_src[56])
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char u_dst[64];
|
||||
unsigned char u_src[64];
|
||||
unsigned char d_src[64];
|
||||
} x448;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
int rc;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
|
||||
memcpy(param.x448.u_src, u_src, 56);
|
||||
memcpy(param.x448.d_src, d_src, 56);
|
||||
|
||||
s390x_flip_endian64(param.x448.u_src, param.x448.u_src);
|
||||
s390x_x448_mod_p(param.x448.u_src);
|
||||
|
||||
s390x_flip_endian64(param.x448.d_src, param.x448.d_src);
|
||||
param.x448.d_src[63] &= 252;
|
||||
param.x448.d_src[8] |= 128;
|
||||
|
||||
rc = s390x_pcc(S390X_SCALAR_MULTIPLY_X448, ¶m.x448) ? 0 : 1;
|
||||
if (rc == 1) {
|
||||
s390x_flip_endian64(param.x448.u_dst, param.x448.u_dst);
|
||||
memcpy(u_dst, param.x448.u_dst, 56);
|
||||
}
|
||||
|
||||
OPENSSL_cleanse(param.x448.d_src, sizeof(param.x448.d_src));
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int s390x_ed25519_mul(unsigned char x_dst[32],
|
||||
unsigned char y_dst[32],
|
||||
const unsigned char x_src[32],
|
||||
const unsigned char y_src[32],
|
||||
const unsigned char d_src[32])
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char x_dst[32];
|
||||
unsigned char y_dst[32];
|
||||
unsigned char x_src[32];
|
||||
unsigned char y_src[32];
|
||||
unsigned char d_src[32];
|
||||
} ed25519;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
int rc;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
|
||||
s390x_flip_endian32(param.ed25519.x_src, x_src);
|
||||
s390x_flip_endian32(param.ed25519.y_src, y_src);
|
||||
s390x_flip_endian32(param.ed25519.d_src, d_src);
|
||||
|
||||
rc = s390x_pcc(S390X_SCALAR_MULTIPLY_ED25519, ¶m.ed25519) ? 0 : 1;
|
||||
if (rc == 1) {
|
||||
s390x_flip_endian32(x_dst, param.ed25519.x_dst);
|
||||
s390x_flip_endian32(y_dst, param.ed25519.y_dst);
|
||||
}
|
||||
|
||||
OPENSSL_cleanse(param.ed25519.d_src, sizeof(param.ed25519.d_src));
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int s390x_ed448_mul(unsigned char x_dst[57],
|
||||
unsigned char y_dst[57],
|
||||
const unsigned char x_src[57],
|
||||
const unsigned char y_src[57],
|
||||
const unsigned char d_src[57])
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char x_dst[64];
|
||||
unsigned char y_dst[64];
|
||||
unsigned char x_src[64];
|
||||
unsigned char y_src[64];
|
||||
unsigned char d_src[64];
|
||||
} ed448;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
int rc;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
|
||||
memcpy(param.ed448.x_src, x_src, 57);
|
||||
memcpy(param.ed448.y_src, y_src, 57);
|
||||
memcpy(param.ed448.d_src, d_src, 57);
|
||||
s390x_flip_endian64(param.ed448.x_src, param.ed448.x_src);
|
||||
s390x_flip_endian64(param.ed448.y_src, param.ed448.y_src);
|
||||
s390x_flip_endian64(param.ed448.d_src, param.ed448.d_src);
|
||||
|
||||
rc = s390x_pcc(S390X_SCALAR_MULTIPLY_ED448, ¶m.ed448) ? 0 : 1;
|
||||
if (rc == 1) {
|
||||
s390x_flip_endian64(param.ed448.x_dst, param.ed448.x_dst);
|
||||
s390x_flip_endian64(param.ed448.y_dst, param.ed448.y_dst);
|
||||
memcpy(x_dst, param.ed448.x_dst, 57);
|
||||
memcpy(y_dst, param.ed448.y_dst, 57);
|
||||
}
|
||||
|
||||
OPENSSL_cleanse(param.ed448.d_src, sizeof(param.ed448.d_src));
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
||||
{
|
||||
static const unsigned char generator[] = {
|
||||
0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
ECX_KEY *key;
|
||||
unsigned char *privkey = NULL, *pubkey;
|
||||
|
||||
key = OPENSSL_zalloc(sizeof(*key));
|
||||
if (key == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECX_KEYGEN25519, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
pubkey = key->pubkey;
|
||||
|
||||
privkey = key->privkey = OPENSSL_secure_malloc(X25519_KEYLEN);
|
||||
if (privkey == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECX_KEYGEN25519, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (RAND_priv_bytes(privkey, X25519_KEYLEN) <= 0)
|
||||
goto err;
|
||||
|
||||
privkey[0] &= 248;
|
||||
privkey[31] &= 127;
|
||||
privkey[31] |= 64;
|
||||
|
||||
if (s390x_x25519_mul(pubkey, generator, privkey) != 1)
|
||||
goto err;
|
||||
|
||||
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
|
||||
return 1;
|
||||
err:
|
||||
OPENSSL_secure_clear_free(privkey, X25519_KEYLEN);
|
||||
key->privkey = NULL;
|
||||
OPENSSL_free(key);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecx_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
||||
{
|
||||
static const unsigned char generator[] = {
|
||||
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
ECX_KEY *key;
|
||||
unsigned char *privkey = NULL, *pubkey;
|
||||
|
||||
key = OPENSSL_zalloc(sizeof(*key));
|
||||
if (key == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECX_KEYGEN448, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
pubkey = key->pubkey;
|
||||
|
||||
privkey = key->privkey = OPENSSL_secure_malloc(X448_KEYLEN);
|
||||
if (privkey == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECX_KEYGEN448, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (RAND_priv_bytes(privkey, X448_KEYLEN) <= 0)
|
||||
goto err;
|
||||
|
||||
privkey[0] &= 252;
|
||||
privkey[55] |= 128;
|
||||
|
||||
if (s390x_x448_mul(pubkey, generator, privkey) != 1)
|
||||
goto err;
|
||||
|
||||
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
|
||||
return 1;
|
||||
err:
|
||||
OPENSSL_secure_clear_free(privkey, X448_KEYLEN);
|
||||
key->privkey = NULL;
|
||||
OPENSSL_free(key);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
||||
{
|
||||
static const unsigned char generator_x[] = {
|
||||
0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9, 0xb2, 0xa7, 0x25, 0x95,
|
||||
0x60, 0xc7, 0x2c, 0x69, 0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0,
|
||||
0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21
|
||||
};
|
||||
static const unsigned char generator_y[] = {
|
||||
0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
|
||||
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
|
||||
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
|
||||
};
|
||||
unsigned char x_dst[32], buff[SHA512_DIGEST_LENGTH];
|
||||
ECX_KEY *key;
|
||||
unsigned char *privkey = NULL, *pubkey;
|
||||
|
||||
key = OPENSSL_zalloc(sizeof(*key));
|
||||
if (key == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_KEYGEN25519, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
pubkey = key->pubkey;
|
||||
|
||||
privkey = key->privkey = OPENSSL_secure_malloc(ED25519_KEYLEN);
|
||||
if (privkey == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_KEYGEN25519, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (RAND_priv_bytes(privkey, ED25519_KEYLEN) <= 0)
|
||||
goto err;
|
||||
|
||||
SHA512(privkey, 32, buff);
|
||||
buff[0] &= 248;
|
||||
buff[31] &= 63;
|
||||
buff[31] |= 64;
|
||||
|
||||
if (s390x_ed25519_mul(x_dst, pubkey,
|
||||
generator_x, generator_y, buff) != 1)
|
||||
goto err;
|
||||
|
||||
pubkey[31] |= ((x_dst[0] & 0x01) << 7);
|
||||
|
||||
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
|
||||
return 1;
|
||||
err:
|
||||
OPENSSL_secure_clear_free(privkey, ED25519_KEYLEN);
|
||||
key->privkey = NULL;
|
||||
OPENSSL_free(key);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
||||
{
|
||||
static const unsigned char generator_x[] = {
|
||||
0x5e, 0xc0, 0x0c, 0xc7, 0x2b, 0xa8, 0x26, 0x26, 0x8e, 0x93, 0x00, 0x8b,
|
||||
0xe1, 0x80, 0x3b, 0x43, 0x11, 0x65, 0xb6, 0x2a, 0xf7, 0x1a, 0xae, 0x12,
|
||||
0x64, 0xa4, 0xd3, 0xa3, 0x24, 0xe3, 0x6d, 0xea, 0x67, 0x17, 0x0f, 0x47,
|
||||
0x70, 0x65, 0x14, 0x9e, 0xda, 0x36, 0xbf, 0x22, 0xa6, 0x15, 0x1d, 0x22,
|
||||
0xed, 0x0d, 0xed, 0x6b, 0xc6, 0x70, 0x19, 0x4f, 0x00
|
||||
};
|
||||
static const unsigned char generator_y[] = {
|
||||
0x14, 0xfa, 0x30, 0xf2, 0x5b, 0x79, 0x08, 0x98, 0xad, 0xc8, 0xd7, 0x4e,
|
||||
0x2c, 0x13, 0xbd, 0xfd, 0xc4, 0x39, 0x7c, 0xe6, 0x1c, 0xff, 0xd3, 0x3a,
|
||||
0xd7, 0xc2, 0xa0, 0x05, 0x1e, 0x9c, 0x78, 0x87, 0x40, 0x98, 0xa3, 0x6c,
|
||||
0x73, 0x73, 0xea, 0x4b, 0x62, 0xc7, 0xc9, 0x56, 0x37, 0x20, 0x76, 0x88,
|
||||
0x24, 0xbc, 0xb6, 0x6e, 0x71, 0x46, 0x3f, 0x69, 0x00
|
||||
};
|
||||
unsigned char x_dst[57], buff[114];
|
||||
ECX_KEY *key;
|
||||
unsigned char *privkey = NULL, *pubkey;
|
||||
EVP_MD_CTX *hashctx = NULL;
|
||||
|
||||
key = OPENSSL_zalloc(sizeof(*key));
|
||||
if (key == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_KEYGEN448, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
pubkey = key->pubkey;
|
||||
|
||||
privkey = key->privkey = OPENSSL_secure_malloc(ED448_KEYLEN);
|
||||
if (privkey == NULL) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_KEYGEN448, ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (RAND_priv_bytes(privkey, ED448_KEYLEN) <= 0)
|
||||
goto err;
|
||||
|
||||
hashctx = EVP_MD_CTX_new();
|
||||
if (hashctx == NULL)
|
||||
goto err;
|
||||
if (EVP_DigestInit_ex(hashctx, EVP_shake256(), NULL) != 1)
|
||||
goto err;
|
||||
if (EVP_DigestUpdate(hashctx, privkey, 57) != 1)
|
||||
goto err;
|
||||
if (EVP_DigestFinalXOF(hashctx, buff, sizeof(buff)) != 1)
|
||||
goto err;
|
||||
|
||||
buff[0] &= -4;
|
||||
buff[55] |= 0x80;
|
||||
buff[56] = 0;
|
||||
|
||||
if (s390x_ed448_mul(x_dst, pubkey,
|
||||
generator_x, generator_y, buff) != 1)
|
||||
goto err;
|
||||
|
||||
pubkey[56] |= ((x_dst[0] & 0x01) << 7);
|
||||
|
||||
EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
|
||||
EVP_MD_CTX_free(hashctx);
|
||||
return 1;
|
||||
err:
|
||||
OPENSSL_secure_clear_free(privkey, ED448_KEYLEN);
|
||||
key->privkey = NULL;
|
||||
OPENSSL_free(key);
|
||||
EVP_MD_CTX_free(hashctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
|
||||
size_t *keylen)
|
||||
{
|
||||
const unsigned char *privkey, *pubkey;
|
||||
|
||||
if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey))
|
||||
return 0;
|
||||
|
||||
if (key != NULL)
|
||||
return s390x_x25519_mul(key, pubkey, privkey);
|
||||
|
||||
*keylen = X25519_KEYLEN;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
|
||||
size_t *keylen)
|
||||
{
|
||||
const unsigned char *privkey, *pubkey;
|
||||
|
||||
if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey))
|
||||
return 0;
|
||||
|
||||
if (key != NULL)
|
||||
return s390x_x448_mul(key, pubkey, privkey);
|
||||
|
||||
*keylen = X448_KEYLEN;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_digestsign25519(EVP_MD_CTX *ctx,
|
||||
unsigned char *sig, size_t *siglen,
|
||||
const unsigned char *tbs,
|
||||
size_t tbslen)
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char sig[64];
|
||||
unsigned char priv[32];
|
||||
} ed25519;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx;
|
||||
int rc;
|
||||
|
||||
if (sig == NULL) {
|
||||
*siglen = ED25519_SIGSIZE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (*siglen < ED25519_SIGSIZE) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_DIGESTSIGN25519, EC_R_BUFFER_TOO_SMALL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
memcpy(param.ed25519.priv, edkey->privkey, sizeof(param.ed25519.priv));
|
||||
|
||||
rc = s390x_kdsa(S390X_EDDSA_SIGN_ED25519, ¶m.ed25519, tbs, tbslen);
|
||||
OPENSSL_cleanse(param.ed25519.priv, sizeof(param.ed25519.priv));
|
||||
if (rc != 0)
|
||||
return 0;
|
||||
|
||||
s390x_flip_endian32(sig, param.ed25519.sig);
|
||||
s390x_flip_endian32(sig + 32, param.ed25519.sig + 32);
|
||||
|
||||
*siglen = ED25519_SIGSIZE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_digestsign448(EVP_MD_CTX *ctx,
|
||||
unsigned char *sig, size_t *siglen,
|
||||
const unsigned char *tbs,
|
||||
size_t tbslen)
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char sig[128];
|
||||
unsigned char priv[64];
|
||||
} ed448;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx;
|
||||
int rc;
|
||||
|
||||
if (sig == NULL) {
|
||||
*siglen = ED448_SIGSIZE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (*siglen < ED448_SIGSIZE) {
|
||||
ECerr(EC_F_S390X_PKEY_ECD_DIGESTSIGN448, EC_R_BUFFER_TOO_SMALL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
memcpy(param.ed448.priv + 64 - 57, edkey->privkey, 57);
|
||||
|
||||
rc = s390x_kdsa(S390X_EDDSA_SIGN_ED448, ¶m.ed448, tbs, tbslen);
|
||||
OPENSSL_cleanse(param.ed448.priv, sizeof(param.ed448.priv));
|
||||
if (rc != 0)
|
||||
return 0;
|
||||
|
||||
s390x_flip_endian64(param.ed448.sig, param.ed448.sig);
|
||||
s390x_flip_endian64(param.ed448.sig + 64, param.ed448.sig + 64);
|
||||
memcpy(sig, param.ed448.sig, 57);
|
||||
memcpy(sig + 57, param.ed448.sig + 64, 57);
|
||||
|
||||
*siglen = ED448_SIGSIZE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_digestverify25519(EVP_MD_CTX *ctx,
|
||||
const unsigned char *sig,
|
||||
size_t siglen,
|
||||
const unsigned char *tbs,
|
||||
size_t tbslen)
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char sig[64];
|
||||
unsigned char pub[32];
|
||||
} ed25519;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx;
|
||||
|
||||
if (siglen != ED25519_SIGSIZE)
|
||||
return 0;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
s390x_flip_endian32(param.ed25519.sig, sig);
|
||||
s390x_flip_endian32(param.ed25519.sig + 32, sig + 32);
|
||||
s390x_flip_endian32(param.ed25519.pub, edkey->pubkey);
|
||||
|
||||
return s390x_kdsa(S390X_EDDSA_VERIFY_ED25519,
|
||||
¶m.ed25519, tbs, tbslen) == 0 ? 1 : 0;
|
||||
}
|
||||
|
||||
static int s390x_pkey_ecd_digestverify448(EVP_MD_CTX *ctx,
|
||||
const unsigned char *sig,
|
||||
size_t siglen,
|
||||
const unsigned char *tbs,
|
||||
size_t tbslen)
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
unsigned char sig[128];
|
||||
unsigned char pub[64];
|
||||
} ed448;
|
||||
unsigned long long buff[512];
|
||||
} param;
|
||||
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx;
|
||||
|
||||
if (siglen != ED448_SIGSIZE)
|
||||
return 0;
|
||||
|
||||
memset(¶m, 0, sizeof(param));
|
||||
memcpy(param.ed448.sig, sig, 57);
|
||||
s390x_flip_endian64(param.ed448.sig, param.ed448.sig);
|
||||
memcpy(param.ed448.sig + 64, sig + 57, 57);
|
||||
s390x_flip_endian64(param.ed448.sig + 64, param.ed448.sig + 64);
|
||||
memcpy(param.ed448.pub, edkey->pubkey, 57);
|
||||
s390x_flip_endian64(param.ed448.pub, param.ed448.pub);
|
||||
|
||||
return s390x_kdsa(S390X_EDDSA_VERIFY_ED448,
|
||||
¶m.ed448, tbs, tbslen) == 0 ? 1 : 0;
|
||||
}
|
||||
|
||||
static const EVP_PKEY_METHOD ecx25519_s390x_pkey_meth = {
|
||||
EVP_PKEY_X25519,
|
||||
0, 0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecx_keygen25519,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecx_derive25519,
|
||||
pkey_ecx_ctrl,
|
||||
0
|
||||
};
|
||||
|
||||
static const EVP_PKEY_METHOD ecx448_s390x_pkey_meth = {
|
||||
EVP_PKEY_X448,
|
||||
0, 0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecx_keygen448,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecx_derive448,
|
||||
pkey_ecx_ctrl,
|
||||
0
|
||||
};
|
||||
static const EVP_PKEY_METHOD ed25519_s390x_pkey_meth = {
|
||||
EVP_PKEY_ED25519, EVP_PKEY_FLAG_SIGCTX_CUSTOM,
|
||||
0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecd_keygen25519,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
pkey_ecd_ctrl,
|
||||
0,
|
||||
s390x_pkey_ecd_digestsign25519,
|
||||
s390x_pkey_ecd_digestverify25519
|
||||
};
|
||||
|
||||
static const EVP_PKEY_METHOD ed448_s390x_pkey_meth = {
|
||||
EVP_PKEY_ED448, EVP_PKEY_FLAG_SIGCTX_CUSTOM,
|
||||
0, 0, 0, 0, 0, 0,
|
||||
s390x_pkey_ecd_keygen448,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
pkey_ecd_ctrl,
|
||||
0,
|
||||
s390x_pkey_ecd_digestsign448,
|
||||
s390x_pkey_ecd_digestverify448
|
||||
};
|
||||
#endif
|
||||
|
||||
const EVP_PKEY_METHOD *ecx25519_pkey_method(void)
|
||||
{
|
||||
#ifdef S390X_EC_ASM
|
||||
if (OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519))
|
||||
return &ecx25519_s390x_pkey_meth;
|
||||
#endif
|
||||
return &ecx25519_pkey_meth;
|
||||
}
|
||||
|
||||
const EVP_PKEY_METHOD *ecx448_pkey_method(void)
|
||||
{
|
||||
#ifdef S390X_EC_ASM
|
||||
if (OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448))
|
||||
return &ecx448_s390x_pkey_meth;
|
||||
#endif
|
||||
return &ecx448_pkey_meth;
|
||||
}
|
||||
|
||||
const EVP_PKEY_METHOD *ed25519_pkey_method(void)
|
||||
{
|
||||
#ifdef S390X_EC_ASM
|
||||
if (OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519)
|
||||
&& OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519)
|
||||
&& OPENSSL_s390xcap_P.kdsa[0]
|
||||
& S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519))
|
||||
return &ed25519_s390x_pkey_meth;
|
||||
#endif
|
||||
return &ed25519_pkey_meth;
|
||||
}
|
||||
|
||||
const EVP_PKEY_METHOD *ed448_pkey_method(void)
|
||||
{
|
||||
#ifdef S390X_EC_ASM
|
||||
if (OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448)
|
||||
&& OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_SIGN_ED448)
|
||||
&& OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448))
|
||||
return &ed448_s390x_pkey_meth;
|
||||
#endif
|
||||
return &ed448_pkey_meth;
|
||||
}
|
||||
Reference in New Issue
Block a user