diff options
| author | jkim <jkim@FreeBSD.org> | 2016-09-22 15:55:27 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-09-22 15:55:27 +0000 |
| commit | 3599587ae793583e28ee9f173cd8fd9a871306f3 (patch) | |
| tree | c5dc8fe4f348f5db5683bbe8d4f3413a7440b924 /crypto/openssl/crypto/pem/pem_err.c | |
| parent | 73e9e3e293d8e68ffafc5d04f0cc74a824c84185 (diff) | |
| download | FreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.zip FreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.tar.gz | |
MFS: r306195
Merge OpenSSL 1.0.2i.
Approved by: re (gjb, implicit), so (delphij)
Diffstat (limited to 'crypto/openssl/crypto/pem/pem_err.c')
| -rw-r--r-- | crypto/openssl/crypto/pem/pem_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/pem/pem_err.c b/crypto/openssl/crypto/pem/pem_err.c index e1f4fdb..4e5f8e9 100644 --- a/crypto/openssl/crypto/pem/pem_err.c +++ b/crypto/openssl/crypto/pem/pem_err.c @@ -1,6 +1,6 @@ /* 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"}, |
