summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-04-24 19:50:45 -0400
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-05-19 00:06:19 -0400
commita5a3722bc185b2baaaa183dcaafaf17b3d07a5fa (patch)
tree51cb4554e39c3c3b4de10cd45d95fdd82987b452 /include
parent67787844f11fd7614bb26452fda1a1de3ed005ef (diff)
make update
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/pem.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 2214bf134e..74445cace2 100644
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -472,9 +472,11 @@ 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
+# define PEM_R_MISSING_DEK_IV 129
# define PEM_R_NOT_DEK_INFO 105
# define PEM_R_NOT_ENCRYPTED 106
# define PEM_R_NOT_PROC_TYPE 107
@@ -485,6 +487,7 @@ void ERR_load_PEM_strings(void);
# define PEM_R_PVK_TOO_SHORT 125
# define PEM_R_READ_KEY 111
# define PEM_R_SHORT_HEADER 112
+# define PEM_R_UNEXPECTED_DEK_IV 130
# define PEM_R_UNSUPPORTED_CIPHER 113
# define PEM_R_UNSUPPORTED_ENCRYPTION 114
# define PEM_R_UNSUPPORTED_KEY_COMPONENTS 126