Update - OpenSSL 1.1.1-pre7-dev
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Generated by util/mkerr.pl DO NOT EDIT
|
||||
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -37,6 +37,8 @@ static const ERR_STRING_DATA RSA_str_functs[] = {
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_NEW, 0), "RSA_meth_new"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_SET1_NAME, 0), "RSA_meth_set1_name"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_MGF1_TO_MD, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_MULTIP_INFO_NEW, 0),
|
||||
"rsa_multip_info_new"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NEW_METHOD, 0), "RSA_new_method"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PRIVATE_DECRYPT, 0), ""},
|
||||
@@ -100,6 +102,7 @@ static const ERR_STRING_DATA RSA_str_functs[] = {
|
||||
"RSA_verify_ASN1_OCTET_STRING"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1, 0),
|
||||
"RSA_verify_PKCS1_PSS_mgf1"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_SETUP_TBUF, 0), "setup_tbuf"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
|
||||
@@ -157,6 +157,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, int primes, BIGNUM *e_value,
|
||||
pinfo = sk_RSA_PRIME_INFO_value(prime_infos, i - 2);
|
||||
prime = pinfo->r;
|
||||
}
|
||||
BN_set_flags(prime, BN_FLG_CONSTTIME);
|
||||
|
||||
for (;;) {
|
||||
redo:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -75,7 +75,7 @@ int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int RSA_meth_get_flags(RSA_METHOD *meth)
|
||||
int RSA_meth_get_flags(const RSA_METHOD *meth)
|
||||
{
|
||||
return meth->flags;
|
||||
}
|
||||
|
||||
+4
-2
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <openssl/bn.h>
|
||||
#include <openssl/err.h>
|
||||
#include "rsa_locl.h"
|
||||
|
||||
void rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo)
|
||||
@@ -32,9 +33,10 @@ RSA_PRIME_INFO *rsa_multip_info_new(void)
|
||||
RSA_PRIME_INFO *pinfo;
|
||||
|
||||
/* create a RSA_PRIME_INFO structure */
|
||||
pinfo = OPENSSL_zalloc(sizeof(RSA_PRIME_INFO));
|
||||
if (pinfo == NULL)
|
||||
if ((pinfo = OPENSSL_zalloc(sizeof(RSA_PRIME_INFO))) == NULL) {
|
||||
RSAerr(RSA_F_RSA_MULTIP_INFO_NEW, ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
if ((pinfo->r = BN_secure_new()) == NULL)
|
||||
goto err;
|
||||
if ((pinfo->d = BN_secure_new()) == NULL)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -101,9 +101,10 @@ static int setup_tbuf(RSA_PKEY_CTX *ctx, EVP_PKEY_CTX *pk)
|
||||
{
|
||||
if (ctx->tbuf != NULL)
|
||||
return 1;
|
||||
ctx->tbuf = OPENSSL_malloc(EVP_PKEY_size(pk->pkey));
|
||||
if (ctx->tbuf == NULL)
|
||||
if ((ctx->tbuf = OPENSSL_malloc(EVP_PKEY_size(pk->pkey))) == NULL) {
|
||||
RSAerr(RSA_F_SETUP_TBUF, ERR_R_MALLOC_FAILURE);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user