← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to crypto/cms/cms_err.c

  • Committer: Package Import Robot
  • Author(s): Kurt Roeckx
  • Date: 2012-03-19 18:23:32 UTC
  • mfrom: (1.2.6)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20120319182332-q4zgqvw51ahauk27
Tags: 1.0.1-1
http://bugs.debian.org/644743
http://bugs.debian.org/663977
http://bugs.debian.org/653495
http://bugs.debian.org/664454
* New upstream version
  - Remove kfreebsd-pipe.patch, fixed upstream
  - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
  - Add OPENSSL_1.0.1 to version-script.patch and libssl1.0.0.symbols for
    the new functions.
  - AES-NI support (Closes: #644743)
* pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
  hidden on amd64, no need to access it PIC anymore.
* pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
* Enable hardening using dpkg-buildflags (Closes: #653495)
* s_client and s_server were forcing SSLv3 only connection when SSLv2 was
  disabled instead of the SSLv2 with upgrade method.  (Closes: #664454)
* Add Beaks on openssh < 1:5.9p1-4, it has a too strict version check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/cms/cms_err.c
1
1
/* crypto/cms/cms_err.c */
2
2
/* ====================================================================
3
 
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 
3
 * Copyright (c) 1999-2009 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
73
73
{ERR_FUNC(CMS_F_CHECK_CONTENT), "CHECK_CONTENT"},
74
74
{ERR_FUNC(CMS_F_CMS_ADD0_CERT), "CMS_add0_cert"},
75
75
{ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_KEY),        "CMS_add0_recipient_key"},
 
76
{ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD),   "CMS_add0_recipient_password"},
76
77
{ERR_FUNC(CMS_F_CMS_ADD1_RECEIPTREQUEST),       "CMS_add1_ReceiptRequest"},
77
78
{ERR_FUNC(CMS_F_CMS_ADD1_RECIPIENT_CERT),       "CMS_add1_recipient_cert"},
78
79
{ERR_FUNC(CMS_F_CMS_ADD1_SIGNER),       "CMS_add1_signer"},
87
88
{ERR_FUNC(CMS_F_CMS_DATAINIT),  "CMS_dataInit"},
88
89
{ERR_FUNC(CMS_F_CMS_DECRYPT),   "CMS_decrypt"},
89
90
{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_KEY),  "CMS_decrypt_set1_key"},
 
91
{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PASSWORD),     "CMS_decrypt_set1_password"},
90
92
{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PKEY), "CMS_decrypt_set1_pkey"},
91
93
{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX),  "cms_DigestAlgorithm_find_ctx"},
92
94
{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO),  "cms_DigestAlgorithm_init_bio"},
105
107
{ERR_FUNC(CMS_F_CMS_GET0_CERTIFICATE_CHOICES),  "CMS_GET0_CERTIFICATE_CHOICES"},
106
108
{ERR_FUNC(CMS_F_CMS_GET0_CONTENT),      "CMS_get0_content"},
107
109
{ERR_FUNC(CMS_F_CMS_GET0_ECONTENT_TYPE),        "CMS_GET0_ECONTENT_TYPE"},
108
 
{ERR_FUNC(CMS_F_CMS_GET0_ENVELOPED),    "CMS_GET0_ENVELOPED"},
 
110
{ERR_FUNC(CMS_F_CMS_GET0_ENVELOPED),    "cms_get0_enveloped"},
109
111
{ERR_FUNC(CMS_F_CMS_GET0_REVOCATION_CHOICES),   "CMS_GET0_REVOCATION_CHOICES"},
110
112
{ERR_FUNC(CMS_F_CMS_GET0_SIGNED),       "CMS_GET0_SIGNED"},
111
113
{ERR_FUNC(CMS_F_CMS_MSGSIGDIGEST_ADD1), "cms_msgSigDigest_add1"},
121
123
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT),        "CMS_RECIPIENTINFO_KTRI_ENCRYPT"},
122
124
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS),      "CMS_RecipientInfo_ktri_get0_algs"},
123
125
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID), "CMS_RecipientInfo_ktri_get0_signer_id"},
 
126
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT),  "cms_RecipientInfo_pwri_crypt"},
124
127
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_KEY),    "CMS_RecipientInfo_set0_key"},
 
128
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD),       "CMS_RecipientInfo_set0_password"},
125
129
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY),   "CMS_RecipientInfo_set0_pkey"},
126
130
{ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER),     "cms_set1_SignerIdentifier"},
127
131
{ERR_FUNC(CMS_F_CMS_SET_DETACHED),      "CMS_set_detached"},
165
169
{ERR_REASON(CMS_R_ERROR_SETTING_KEY)     ,"error setting key"},
166
170
{ERR_REASON(CMS_R_ERROR_SETTING_RECIPIENTINFO),"error setting recipientinfo"},
167
171
{ERR_REASON(CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),"invalid encrypted key length"},
 
172
{ERR_REASON(CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER),"invalid key encryption parameter"},
168
173
{ERR_REASON(CMS_R_INVALID_KEY_LENGTH)    ,"invalid key length"},
169
174
{ERR_REASON(CMS_R_MD_BIO_INIT_ERROR)     ,"md bio init error"},
170
175
{ERR_REASON(CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),"messagedigest attribute wrong length"},
177
182
{ERR_REASON(CMS_R_NOT_ENCRYPTED_DATA)    ,"not encrypted data"},
178
183
{ERR_REASON(CMS_R_NOT_KEK)               ,"not kek"},
179
184
{ERR_REASON(CMS_R_NOT_KEY_TRANSPORT)     ,"not key transport"},
 
185
{ERR_REASON(CMS_R_NOT_PWRI)              ,"not pwri"},
180
186
{ERR_REASON(CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),"not supported for this key type"},
181
187
{ERR_REASON(CMS_R_NO_CIPHER)             ,"no cipher"},
182
188
{ERR_REASON(CMS_R_NO_CONTENT)            ,"no content"},
189
195
{ERR_REASON(CMS_R_NO_MATCHING_RECIPIENT) ,"no matching recipient"},
190
196
{ERR_REASON(CMS_R_NO_MATCHING_SIGNATURE) ,"no matching signature"},
191
197
{ERR_REASON(CMS_R_NO_MSGSIGDIGEST)       ,"no msgsigdigest"},
 
198
{ERR_REASON(CMS_R_NO_PASSWORD)           ,"no password"},
192
199
{ERR_REASON(CMS_R_NO_PRIVATE_KEY)        ,"no private key"},
193
200
{ERR_REASON(CMS_R_NO_PUBLIC_KEY)         ,"no public key"},
194
201
{ERR_REASON(CMS_R_NO_RECEIPT_REQUEST)    ,"no receipt request"},
212
219
{ERR_REASON(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),"unsupported compression algorithm"},
213
220
{ERR_REASON(CMS_R_UNSUPPORTED_CONTENT_TYPE),"unsupported content type"},
214
221
{ERR_REASON(CMS_R_UNSUPPORTED_KEK_ALGORITHM),"unsupported kek algorithm"},
 
222
{ERR_REASON(CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM),"unsupported key encryption algorithm"},
215
223
{ERR_REASON(CMS_R_UNSUPPORTED_RECIPIENT_TYPE),"unsupported recipient type"},
216
224
{ERR_REASON(CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE),"unsupported recpientinfo type"},
217
225
{ERR_REASON(CMS_R_UNSUPPORTED_TYPE)      ,"unsupported type"},
218
226
{ERR_REASON(CMS_R_UNWRAP_ERROR)          ,"unwrap error"},
 
227
{ERR_REASON(CMS_R_UNWRAP_FAILURE)        ,"unwrap failure"},
219
228
{ERR_REASON(CMS_R_VERIFICATION_FAILURE)  ,"verification failure"},
220
229
{ERR_REASON(CMS_R_WRAP_ERROR)            ,"wrap error"},
221
230
{0,NULL}