mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
83b4049ab7
Fixed a memory leak in ASN1_digest and ASN1_item_digest. Reworked error handling in asn1_item_embed_new. Fixed error handling in int_ctx_new and EVP_PKEY_CTX_dup. Fixed a memory leak in CRYPTO_free_ex_data. Reworked error handing in x509_name_ex_d2i, x509_name_encode and x509_name_canon. Check for null pointer in tls_process_cert_verify. Fixes #2103 #2104 #2105 #2109 #2111 #2115 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2342)
67 lines
1.4 KiB
C
67 lines
1.4 KiB
C
/*
|
|
* Copyright 1995-2016 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
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
|
|
#include "internal/cryptlib.h"
|
|
|
|
#ifndef NO_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#include <openssl/err.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/x509.h>
|
|
|
|
#ifndef NO_ASN1_OLD
|
|
|
|
int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
|
|
unsigned char *md, unsigned int *len)
|
|
{
|
|
int i;
|
|
unsigned char *str, *p;
|
|
|
|
i = i2d(data, NULL);
|
|
if ((str = OPENSSL_malloc(i)) == NULL) {
|
|
ASN1err(ASN1_F_ASN1_DIGEST, ERR_R_MALLOC_FAILURE);
|
|
return (0);
|
|
}
|
|
p = str;
|
|
i2d(data, &p);
|
|
|
|
if (!EVP_Digest(str, i, md, len, type, NULL)) {
|
|
OPENSSL_free(str);
|
|
return 0;
|
|
}
|
|
OPENSSL_free(str);
|
|
return (1);
|
|
}
|
|
|
|
#endif
|
|
|
|
int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn,
|
|
unsigned char *md, unsigned int *len)
|
|
{
|
|
int i;
|
|
unsigned char *str = NULL;
|
|
|
|
i = ASN1_item_i2d(asn, &str, it);
|
|
if (!str)
|
|
return (0);
|
|
|
|
if (!EVP_Digest(str, i, md, len, type, NULL)) {
|
|
OPENSSL_free(str);
|
|
return 0;
|
|
}
|
|
OPENSSL_free(str);
|
|
return (1);
|
|
}
|