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

Make update fixing duplicate ASN1 error codes.

parent 809fa4cc

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 1.0.0-dev XX xxx XXXX

 OpenSSL 1.0.0-beta1 XX xxx XXXX



 Copyright (c) 1998-2008 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ $multilib = 


*** debug-ben-debug

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       =

crypto/asn1/asn1.h

+2 −2
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_R_BAD_OBJECT_HEADER			 102

#define ASN1_R_BAD_PASSWORD_READ			 103

#define ASN1_R_BAD_TAG					 104

#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 210

#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 214

#define ASN1_R_BN_LIB					 105

#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106

#define ASN1_R_BUFFER_TOO_SMALL				 107
@@ -1370,7 +1370,7 @@ void ERR_load_ASN1_strings(void); 
#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157

#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158

#define ASN1_R_UNEXPECTED_EOC				 159

#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 211

#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 215

#define ASN1_R_UNKNOWN_FORMAT				 160

#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161

#define ASN1_R_UNKNOWN_OBJECT_TYPE			 162

crypto/asn1/asn1_err.c

+2 −2
Original line number Diff line number Diff line 
/* crypto/asn1/asn1_err.c */

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

 * Copyright (c) 1999-2007 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
@@ -176,7 +176,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= 
{ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV),	"PKCS5_pbe2_set_iv"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET),	"PKCS5_pbe_set"},

{ERR_FUNC(ASN1_F_PKCS5_PBE_SET0_ALGOR),	"PKCS5_pbe_set0_algor"},

{ERR_FUNC(ASN1_F_SMIME_READ_ASN1),	"SMIME_read_asn1"},

{ERR_FUNC(ASN1_F_SMIME_READ_ASN1),	"SMIME_read_ASN1"},

{ERR_FUNC(ASN1_F_SMIME_TEXT),	"SMIME_text"},

{ERR_FUNC(ASN1_F_X509_CINF_NEW),	"X509_CINF_NEW"},

{ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED),	"X509_CRL_add0_revoked"},

crypto/objects/obj_xref.h

+1 −1
Original line number Diff line number Diff line 
/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */

/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */



typedef struct

	{