early-access version 2698
This commit is contained in:
6
externals/libressl/crypto/pkcs12/p12_decr.c
vendored
6
externals/libressl/crypto/pkcs12/p12_decr.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: p12_decr.c,v 1.19 2018/05/13 14:22:34 tb Exp $ */
|
||||
/* $OpenBSD: p12_decr.c,v 1.21 2021/12/12 21:30:14 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
@@ -62,6 +62,8 @@
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/pkcs12.h>
|
||||
|
||||
#include "evp_locl.h"
|
||||
|
||||
/* Encrypt/Decrypt a buffer based on password and algor, result in a
|
||||
* malloc'ed buffer
|
||||
*/
|
||||
@@ -156,7 +158,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
|
||||
unsigned char *in = NULL;
|
||||
int inlen;
|
||||
|
||||
if (!(oct = ASN1_OCTET_STRING_new ())) {
|
||||
if (!(oct = ASN1_OCTET_STRING_new())) {
|
||||
PKCS12error(ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user