Commit a1be17a7 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update to have PEM_R_HEADER_TOO_LONG defined 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent b552f32d

crypto/ec/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ ec_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h 
ec_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

ec_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

ec_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h

ec_ameth.o: ec_ameth.c

ec_ameth.o: ec_ameth.c ec_lcl.h

ec_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

ec_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

ec_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/pem/pem.h

+4 −2
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, 
 * The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

 */



void ERR_load_PEM_strings(void);



/* Error codes for the PEM functions. */
@@ -592,6 +593,7 @@ void ERR_load_PEM_strings(void); 
# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115

# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119

# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120

# define PEM_R_HEADER_TOO_LONG                            128

# define PEM_R_INCONSISTENT_HEADER                        121

# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122

# define PEM_R_KEYBLOB_TOO_SHORT                          123

crypto/pem/pem_err.c

+2 −1
Original line number Diff line number Diff line 
/* crypto/pem/pem_err.c */

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

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

 * Copyright (c) 1999-2016 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
@@ -132,6 +132,7 @@ static ERR_STRING_DATA PEM_str_reasons[] = { 
     "expecting private key blob"},

    {ERR_REASON(PEM_R_EXPECTING_PUBLIC_KEY_BLOB),

     "expecting public key blob"},

    {ERR_REASON(PEM_R_HEADER_TOO_LONG), "header too long"},

    {ERR_REASON(PEM_R_INCONSISTENT_HEADER), "inconsistent header"},

    {ERR_REASON(PEM_R_KEYBLOB_HEADER_PARSE_ERROR),

     "keyblob header parse error"},