38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
diff -up openssl-1.1.1b/crypto/conf/conf_lib.c.regression openssl-1.1.1b/crypto/conf/conf_lib.c
|
|
--- openssl-1.1.1b/crypto/conf/conf_lib.c.regression 2019-02-26 15:15:30.000000000 +0100
|
|
+++ openssl-1.1.1b/crypto/conf/conf_lib.c 2019-05-10 14:28:57.718049429 +0200
|
|
@@ -356,8 +356,10 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(
|
|
{
|
|
OPENSSL_INIT_SETTINGS *ret = malloc(sizeof(*ret));
|
|
|
|
- if (ret != NULL)
|
|
- memset(ret, 0, sizeof(*ret));
|
|
+ if (ret == NULL)
|
|
+ return NULL;
|
|
+
|
|
+ memset(ret, 0, sizeof(*ret));
|
|
ret->flags = DEFAULT_CONF_MFLAGS;
|
|
|
|
return ret;
|
|
diff -up openssl-1.1.1b/crypto/evp/evp_enc.c.regression openssl-1.1.1b/crypto/evp/evp_enc.c
|
|
--- openssl-1.1.1b/crypto/evp/evp_enc.c.regression 2019-05-07 11:52:35.982596242 +0200
|
|
+++ openssl-1.1.1b/crypto/evp/evp_enc.c 2019-05-10 14:30:42.269243383 +0200
|
|
@@ -338,7 +338,7 @@ static int evp_EncryptDecryptUpdate(EVP_
|
|
|
|
bl = ctx->cipher->block_size;
|
|
|
|
- if (inl <= 0) {
|
|
+ if (in == NULL && inl <= 0) {
|
|
*outl = 0;
|
|
return inl == 0;
|
|
}
|
|
@@ -491,7 +491,7 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ct
|
|
if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS))
|
|
cmpl = (cmpl + 7) / 8;
|
|
|
|
- if (inl <= 0) {
|
|
+ if (in == NULL && inl <= 0) {
|
|
*outl = 0;
|
|
return inl == 0;
|
|
}
|