diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-16 14:14:33 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-16 13:54:46 +0100 |
| commit | 6c858db32b1ae293d7649ea593de3359225a4f7e (patch) | |
| tree | 6f339af2d3c211ecd42d77353b5cbde42bcd7b36 | |
| parent | 17603dd994d6738c36ef7ab27e352aec9d6bd605 (diff) | |
make update to have PEM_R_HEADER_TOO_LONG defined
(cherry picked from commit a1be17a72f6e0fe98275dc113cddd799bf55df44)
Conflicts:
crypto/pem/pem_err.c
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
| -rw-r--r-- | crypto/pem/pem.h | 1 | ||||
| -rw-r--r-- | crypto/pem/pem_err.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 2cdad8ac26..de4ba3ee1d 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -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 diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c index 702c5adecb..f02de5c44a 100644 --- a/crypto/pem/pem_err.c +++ b/crypto/pem/pem_err.c @@ -1,6 +1,6 @@ /* 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"}, |