Commit 1cd47f5f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Ooops revert stuff which shouldn't have been part of previous commit.

parent 67556483

crypto/evp/evp.h

+0 −2
Original line number Diff line number Diff line
@@ -1289,8 +1289,6 @@ void ERR_load_EVP_strings(void); 
#define EVP_R_PRIVATE_KEY_DECODE_ERROR			 145

#define EVP_R_PRIVATE_KEY_ENCODE_ERROR			 146

#define EVP_R_PUBLIC_KEY_NOT_RSA			 106

#define EVP_R_UNKNOWN_CIPHER				 160

#define EVP_R_UNKNOWN_DIGEST				 161

#define EVP_R_UNKNOWN_PBE_ALGORITHM			 121

#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS		 135

#define EVP_R_UNSUPPORTED_ALGORITHM			 156

crypto/evp/evp_err.c

+2 −4
Original line number Diff line number Diff line 
/* crypto/evp/evp_err.c */

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

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

 * Copyright (c) 1999-2008 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
@@ -85,7 +85,7 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX),	"EVP_DigestInit_ex"},

{ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX),	"EVP_EncryptFinal_ex"},

{ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX),	"EVP_MD_CTX_copy_ex"},

{ERR_FUNC(EVP_F_EVP_MD_SIZE),	"EVP_MD_size"},

{ERR_FUNC(EVP_F_EVP_MD_SIZE),	"EVP_MD_SIZE"},

{ERR_FUNC(EVP_F_EVP_OPENINIT),	"EVP_OpenInit"},

{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD),	"EVP_PBE_alg_add"},

{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE),	"EVP_PBE_alg_add_type"},
@@ -185,8 +185,6 @@ static ERR_STRING_DATA EVP_str_reasons[]= 
{ERR_REASON(EVP_R_PRIVATE_KEY_DECODE_ERROR),"private key decode error"},

{ERR_REASON(EVP_R_PRIVATE_KEY_ENCODE_ERROR),"private key encode error"},

{ERR_REASON(EVP_R_PUBLIC_KEY_NOT_RSA)    ,"public key not rsa"},

{ERR_REASON(EVP_R_UNKNOWN_CIPHER)        ,"unknown cipher"},

{ERR_REASON(EVP_R_UNKNOWN_DIGEST)        ,"unknown digest"},

{ERR_REASON(EVP_R_UNKNOWN_PBE_ALGORITHM) ,"unknown pbe algorithm"},

{ERR_REASON(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS),"unsuported number of rounds"},

{ERR_REASON(EVP_R_UNSUPPORTED_ALGORITHM) ,"unsupported algorithm"},

crypto/evp/evp_pbe.c

+0 −14
Original line number Diff line number Diff line
@@ -174,26 +174,12 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, 
	if (cipher_nid == -1)

		cipher = NULL;

	else

		{

		cipher = EVP_get_cipherbynid(cipher_nid);

		if (!cipher)

			{

			EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_CIPHER);

			return 0;

			}

		}



	if (md_nid == -1)

		md = NULL;

	else

		{

		md = EVP_get_digestbynid(md_nid);

		if (!md)

			{

			EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_DIGEST);

			return 0;

			}

		}



	if (!keygen(ctx, pass, passlen, param, cipher, md, en_de))

		{

demos/pkcs12/pkread.c

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ int main(int argc, char **argv) 
		fprintf(stderr, "Usage: pkread p12file password opfile\n");

		exit (1);

	}

	/*SSLeay_add_all_algorithms();*/

OpenSSL_add_all_digests();

	SSLeay_add_all_algorithms();

	ERR_load_crypto_strings();

	if (!(fp = fopen(argv[1], "rb"))) {

		fprintf(stderr, "Error opening file %s\n", argv[1]);