Commit a291745e authored by Bodo Möller's avatar Bodo Möller
Browse files

fix function codes for error

parent 0862caf2

crypto/pkcs7/pk7_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl) 
		*sk=sk_X509_CRL_new_null();

	if (*sk == NULL)

		{

		PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,ERR_R_MALLOC_FAILURE);

		PKCS7err(PKCS7_F_PKCS7_ADD_CRL,ERR_R_MALLOC_FAILURE);

		return 0;

		}

crypto/pkcs7/pk7_mime.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags) 
		bio = BIO_new_PKCS7(out, p7);

		if (!bio)

			{

			PKCS7err(PKCS7_F_B64_WRITE_PKCS7,ERR_R_MALLOC_FAILURE);

			PKCS7err(PKCS7_F_PKCS7_BIO_STREAM,ERR_R_MALLOC_FAILURE);

			return 0;

			}

		SMIME_crlf_copy(in, bio, flags);

crypto/pkcs7/pkcs7.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ void ERR_load_PKCS7_strings(void); 
#define PKCS7_F_PKCS7_ADD_SIGNATURE			 131

#define PKCS7_F_PKCS7_ADD_SIGNER			 103

#define PKCS7_F_PKCS7_BIO_ADD_DIGEST			 125

#define PKCS7_F_PKCS7_BIO_STREAM			 140

#define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST		 138

#define PKCS7_F_PKCS7_CTRL				 104

#define PKCS7_F_PKCS7_DATADECODE			 112

crypto/pkcs7/pkcs7err.c

+2 −1
Original line number Diff line number Diff line 
/* crypto/pkcs7/pkcs7err.c */

/* ====================================================================

 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -81,6 +81,7 @@ static ERR_STRING_DATA PKCS7_str_functs[]= 
{ERR_FUNC(PKCS7_F_PKCS7_ADD_SIGNATURE),	"PKCS7_add_signature"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_SIGNER),	"PKCS7_add_signer"},

{ERR_FUNC(PKCS7_F_PKCS7_BIO_ADD_DIGEST),	"PKCS7_BIO_ADD_DIGEST"},

{ERR_FUNC(PKCS7_F_PKCS7_BIO_STREAM),	"PKCS7_BIO_STREAM"},

{ERR_FUNC(PKCS7_F_PKCS7_COPY_EXISTING_DIGEST),	"PKCS7_COPY_EXISTING_DIGEST"},

{ERR_FUNC(PKCS7_F_PKCS7_CTRL),	"PKCS7_ctrl"},

{ERR_FUNC(PKCS7_F_PKCS7_DATADECODE),	"PKCS7_dataDecode"},

crypto/rsa/rsa_sign.c

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int int_rsa_verify(int dtype, const unsigned char *m, 
		/* Excess data can be used to create forgeries */

		if(p != s+i)

			{

			RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);

			RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE);

			goto err;

			}
@@ -206,7 +206,7 @@ int int_rsa_verify(int dtype, const unsigned char *m, 
		if(sig->algor->parameter

		   && ASN1_TYPE_get(sig->algor->parameter) != V_ASN1_NULL)

			{

			RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);

			RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE);

			goto err;

			}