7d550561e3
Call to i2d method returns an int value.
Fix:
CID 1338183 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
CID 1371691 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
CID 1371692 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
[extended tests]
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7359)
(cherry picked from commit da84249be6)
67 lines
1.5 KiB
C
67 lines
1.5 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 <sys/types.h>
|
|
|
|
#include "internal/cryptlib.h"
|
|
|
|
#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 inl;
|
|
unsigned char *str, *p;
|
|
|
|
inl = i2d(data, NULL);
|
|
if (inl <= 0) {
|
|
ASN1err(ASN1_F_ASN1_DIGEST, ERR_R_INTERNAL_ERROR);
|
|
return 0;
|
|
}
|
|
if ((str = OPENSSL_malloc(inl)) == NULL) {
|
|
ASN1err(ASN1_F_ASN1_DIGEST, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
p = str;
|
|
i2d(data, &p);
|
|
|
|
if (!EVP_Digest(str, inl, 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;
|
|
}
|