← Back to branch summary

~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to crypto/pem/pem_err.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
https://launchpad.net/bugs/675566
* Resynchronise with Debian (LP: #675566).  Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/pem/pem_err.c
1
1
/* crypto/pem/pem_err.c */
2
2
/* ====================================================================
3
 
 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
 
3
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
6
6
 * modification, are permitted provided that the following conditions
70
70
 
71
71
static ERR_STRING_DATA PEM_str_functs[]=
72
72
        {
 
73
{ERR_FUNC(PEM_F_B2I_DSS),       "B2I_DSS"},
 
74
{ERR_FUNC(PEM_F_B2I_PVK_BIO),   "b2i_PVK_bio"},
 
75
{ERR_FUNC(PEM_F_B2I_RSA),       "B2I_RSA"},
 
76
{ERR_FUNC(PEM_F_CHECK_BITLEN_DSA),      "CHECK_BITLEN_DSA"},
 
77
{ERR_FUNC(PEM_F_CHECK_BITLEN_RSA),      "CHECK_BITLEN_RSA"},
73
78
{ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_BIO),       "d2i_PKCS8PrivateKey_bio"},
74
79
{ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_FP),        "d2i_PKCS8PrivateKey_fp"},
 
80
{ERR_FUNC(PEM_F_DO_B2I),        "DO_B2I"},
 
81
{ERR_FUNC(PEM_F_DO_B2I_BIO),    "DO_B2I_BIO"},
 
82
{ERR_FUNC(PEM_F_DO_BLOB_HEADER),        "DO_BLOB_HEADER"},
75
83
{ERR_FUNC(PEM_F_DO_PK8PKEY),    "DO_PK8PKEY"},
76
84
{ERR_FUNC(PEM_F_DO_PK8PKEY_FP), "DO_PK8PKEY_FP"},
 
85
{ERR_FUNC(PEM_F_DO_PVK_BODY),   "DO_PVK_BODY"},
 
86
{ERR_FUNC(PEM_F_DO_PVK_HEADER), "DO_PVK_HEADER"},
 
87
{ERR_FUNC(PEM_F_I2B_PVK),       "I2B_PVK"},
 
88
{ERR_FUNC(PEM_F_I2B_PVK_BIO),   "i2b_PVK_bio"},
77
89
{ERR_FUNC(PEM_F_LOAD_IV),       "LOAD_IV"},
78
90
{ERR_FUNC(PEM_F_PEM_ASN1_READ), "PEM_ASN1_read"},
79
91
{ERR_FUNC(PEM_F_PEM_ASN1_READ_BIO),     "PEM_ASN1_read_bio"},
86
98
{ERR_FUNC(PEM_F_PEM_PK8PKEY),   "PEM_PK8PKEY"},
87
99
{ERR_FUNC(PEM_F_PEM_READ),      "PEM_read"},
88
100
{ERR_FUNC(PEM_F_PEM_READ_BIO),  "PEM_read_bio"},
 
101
{ERR_FUNC(PEM_F_PEM_READ_BIO_PARAMETERS),       "PEM_read_bio_Parameters"},
89
102
{ERR_FUNC(PEM_F_PEM_READ_BIO_PRIVATEKEY),       "PEM_READ_BIO_PRIVATEKEY"},
90
103
{ERR_FUNC(PEM_F_PEM_READ_PRIVATEKEY),   "PEM_READ_PRIVATEKEY"},
91
104
{ERR_FUNC(PEM_F_PEM_SEALFINAL), "PEM_SealFinal"},
93
106
{ERR_FUNC(PEM_F_PEM_SIGNFINAL), "PEM_SignFinal"},
94
107
{ERR_FUNC(PEM_F_PEM_WRITE),     "PEM_write"},
95
108
{ERR_FUNC(PEM_F_PEM_WRITE_BIO), "PEM_write_bio"},
 
109
{ERR_FUNC(PEM_F_PEM_WRITE_PRIVATEKEY),  "PEM_WRITE_PRIVATEKEY"},
96
110
{ERR_FUNC(PEM_F_PEM_X509_INFO_READ),    "PEM_X509_INFO_read"},
97
111
{ERR_FUNC(PEM_F_PEM_X509_INFO_READ_BIO),        "PEM_X509_INFO_read_bio"},
98
112
{ERR_FUNC(PEM_F_PEM_X509_INFO_WRITE_BIO),       "PEM_X509_INFO_write_bio"},
105
119
{ERR_REASON(PEM_R_BAD_DECRYPT)           ,"bad decrypt"},
106
120
{ERR_REASON(PEM_R_BAD_END_LINE)          ,"bad end line"},
107
121
{ERR_REASON(PEM_R_BAD_IV_CHARS)          ,"bad iv chars"},
 
122
{ERR_REASON(PEM_R_BAD_MAGIC_NUMBER)      ,"bad magic number"},
108
123
{ERR_REASON(PEM_R_BAD_PASSWORD_READ)     ,"bad password read"},
 
124
{ERR_REASON(PEM_R_BAD_VERSION_NUMBER)    ,"bad version number"},
 
125
{ERR_REASON(PEM_R_BIO_WRITE_FAILURE)     ,"bio write failure"},
 
126
{ERR_REASON(PEM_R_CIPHER_IS_NULL)        ,"cipher is null"},
109
127
{ERR_REASON(PEM_R_ERROR_CONVERTING_PRIVATE_KEY),"error converting private key"},
 
128
{ERR_REASON(PEM_R_EXPECTING_PRIVATE_KEY_BLOB),"expecting private key blob"},
 
129
{ERR_REASON(PEM_R_EXPECTING_PUBLIC_KEY_BLOB),"expecting public key blob"},
 
130
{ERR_REASON(PEM_R_INCONSISTENT_HEADER)   ,"inconsistent header"},
 
131
{ERR_REASON(PEM_R_KEYBLOB_HEADER_PARSE_ERROR),"keyblob header parse error"},
 
132
{ERR_REASON(PEM_R_KEYBLOB_TOO_SHORT)     ,"keyblob too short"},
110
133
{ERR_REASON(PEM_R_NOT_DEK_INFO)          ,"not dek info"},
111
134
{ERR_REASON(PEM_R_NOT_ENCRYPTED)         ,"not encrypted"},
112
135
{ERR_REASON(PEM_R_NOT_PROC_TYPE)         ,"not proc type"},
113
136
{ERR_REASON(PEM_R_NO_START_LINE)         ,"no start line"},
114
137
{ERR_REASON(PEM_R_PROBLEMS_GETTING_PASSWORD),"problems getting password"},
115
138
{ERR_REASON(PEM_R_PUBLIC_KEY_NO_RSA)     ,"public key no rsa"},
 
139
{ERR_REASON(PEM_R_PVK_DATA_TOO_SHORT)    ,"pvk data too short"},
 
140
{ERR_REASON(PEM_R_PVK_TOO_SHORT)         ,"pvk too short"},
116
141
{ERR_REASON(PEM_R_READ_KEY)              ,"read key"},
117
142
{ERR_REASON(PEM_R_SHORT_HEADER)          ,"short header"},
118
143
{ERR_REASON(PEM_R_UNSUPPORTED_CIPHER)    ,"unsupported cipher"},
119
144
{ERR_REASON(PEM_R_UNSUPPORTED_ENCRYPTION),"unsupported encryption"},
 
145
{ERR_REASON(PEM_R_UNSUPPORTED_KEY_COMPONENTS),"unsupported key components"},
120
146
{0,NULL}
121
147
        };
122
148