Latest update.

2020-01-21 10:59:59 +09:00
parent 0f7abb4eb6
commit f2d048b604
94 changed files with 989 additions and 10719 deletions
@@ -1156,6 +1156,7 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
    unsigned char x_dst[32], buff[SHA512_DIGEST_LENGTH];
    ECX_KEY *key;
    unsigned char *privkey = NULL, *pubkey;
+    unsigned int sz;

    key = OPENSSL_zalloc(sizeof(*key));
    if (key == NULL) {
@@ -1174,7 +1175,9 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
    if (RAND_priv_bytes(privkey, ED25519_KEYLEN) <= 0)
        goto err;

-    SHA512(privkey, 32, buff);
+    if (!EVP_Digest(privkey, 32, buff, &sz, EVP_sha512(), NULL))
+        goto err;
+
    buff[0] &= 248;
    buff[31] &= 63;
    buff[31] |= 64;