← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to crypto/pem/pem.h

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2009-06-13 18:15:46 UTC
  • mto: (11.1.5 squeeze)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: james.westby@ubuntu.com-20090613181546-vbfntai3b009dl1u
Tags: upstream-0.9.8k
Import upstream version 0.9.8k

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/pem/pem.h
125
125
#define PEM_STRING_DSA          "DSA PRIVATE KEY"
126
126
#define PEM_STRING_DSA_PUBLIC   "DSA PUBLIC KEY"
127
127
#define PEM_STRING_PKCS7        "PKCS7"
 
128
#define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
128
129
#define PEM_STRING_PKCS8        "ENCRYPTED PRIVATE KEY"
129
130
#define PEM_STRING_PKCS8INF     "PRIVATE KEY"
130
131
#define PEM_STRING_DHPARAMS     "DH PARAMETERS"
133
134
#define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
134
135
#define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
135
136
#define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
 
137
#define PEM_STRING_CMS          "CMS"
136
138
 
137
139
  /* Note that this structure is initialised by PEM_SealInit and cleaned up
138
140
     by PEM_SealFinal (at least for now) */
213
215
 
214
216
#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
215
217
#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
 
218
#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
216
219
#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
 
220
#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
217
221
 
218
222
#else
219
223
 
353
357
 
354
358
#define DECLARE_PEM_read_fp(name, type) /**/
355
359
#define DECLARE_PEM_write_fp(name, type) /**/
 
360
#define DECLARE_PEM_write_fp_const(name, type) /**/
356
361
#define DECLARE_PEM_write_cb_fp(name, type) /**/
357
362
 
358
363
#else
390
395
 
391
396
#define DECLARE_PEM_read_bio(name, type) /**/
392
397
#define DECLARE_PEM_write_bio(name, type) /**/
 
398
#define DECLARE_PEM_write_bio_const(name, type) /**/
393
399
#define DECLARE_PEM_write_cb_bio(name, type) /**/
394
400
 
395
401
#endif