Commit 6c858db3 authored by Richard Levitte's avatar Richard Levitte Committed by Dr. Stephen Henson
Browse files

make update to have PEM_R_HEADER_TOO_LONG defined 



(cherry picked from commit a1be17a7)

Conflicts:
	crypto/pem/pem_err.c

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent 17603dd9

crypto/pem/pem.h

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,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-2007 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
@@ -130,6 +130,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"},