Commit a5a3722b authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

make update 



Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent 67787844

crypto/pem/pem_err.c

+5 −4
Original line number Diff line number Diff line
@@ -82,23 +82,24 @@ static ERR_STRING_DATA PEM_str_reasons[] = { 
     "error converting private key"},

    {ERR_REASON(PEM_R_EXPECTING_PRIVATE_KEY_BLOB),

     "expecting private key blob"},

    {ERR_REASON(PEM_R_EXPECTING_PUBLIC_KEY_BLOB),

     "expecting public 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"},

    {ERR_REASON(PEM_R_KEYBLOB_TOO_SHORT), "keyblob too short"},

    {ERR_REASON(PEM_R_MISSING_DEK_IV), "missing dek iv"},

    {ERR_REASON(PEM_R_NOT_DEK_INFO), "not dek info"},

    {ERR_REASON(PEM_R_NOT_ENCRYPTED), "not encrypted"},

    {ERR_REASON(PEM_R_NOT_PROC_TYPE), "not proc type"},

    {ERR_REASON(PEM_R_NO_START_LINE), "no start line"},

    {ERR_REASON(PEM_R_PROBLEMS_GETTING_PASSWORD),

     "problems getting password"},

    {ERR_REASON(PEM_R_PROBLEMS_GETTING_PASSWORD), "problems getting password"},

    {ERR_REASON(PEM_R_PUBLIC_KEY_NO_RSA), "public key no rsa"},

    {ERR_REASON(PEM_R_PVK_DATA_TOO_SHORT), "pvk data too short"},

    {ERR_REASON(PEM_R_PVK_TOO_SHORT), "pvk too short"},

    {ERR_REASON(PEM_R_READ_KEY), "read key"},

    {ERR_REASON(PEM_R_SHORT_HEADER), "short header"},

    {ERR_REASON(PEM_R_UNEXPECTED_DEK_IV), "unexpected dek iv"},

    {ERR_REASON(PEM_R_UNSUPPORTED_CIPHER), "unsupported cipher"},

    {ERR_REASON(PEM_R_UNSUPPORTED_ENCRYPTION), "unsupported encryption"},

    {ERR_REASON(PEM_R_UNSUPPORTED_KEY_COMPONENTS),

include/openssl/pem.h

+3 −0
Original line number Diff line number Diff line
@@ -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