diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem.h')
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index 6eae9345a1..daf5b1375d 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
@@ -206,15 +206,6 @@ typedef struct pem_ctx_st { | |||
206 | * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) | 206 | * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) |
207 | */ | 207 | */ |
208 | 208 | ||
209 | #ifdef OPENSSL_NO_FP_API | ||
210 | |||
211 | #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/ | ||
212 | #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/ | ||
213 | #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/ | ||
214 | #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/ | ||
215 | #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/ | ||
216 | |||
217 | #else | ||
218 | 209 | ||
219 | #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ | 210 | #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ |
220 | type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ | 211 | type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ |
@@ -250,7 +241,6 @@ int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ | |||
250 | return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \ | 241 | return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \ |
251 | } | 242 | } |
252 | 243 | ||
253 | #endif | ||
254 | 244 | ||
255 | #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ | 245 | #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ |
256 | type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\ | 246 | type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\ |
@@ -318,13 +308,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ | |||
318 | 308 | ||
319 | /* These are the same except they are for the declarations */ | 309 | /* These are the same except they are for the declarations */ |
320 | 310 | ||
321 | #if defined(OPENSSL_NO_FP_API) | ||
322 | |||
323 | #define DECLARE_PEM_read_fp(name, type) /**/ | ||
324 | #define DECLARE_PEM_write_fp(name, type) /**/ | ||
325 | #define DECLARE_PEM_write_cb_fp(name, type) /**/ | ||
326 | |||
327 | #else | ||
328 | 311 | ||
329 | #define DECLARE_PEM_read_fp(name, type) \ | 312 | #define DECLARE_PEM_read_fp(name, type) \ |
330 | type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u); | 313 | type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u); |
@@ -339,7 +322,6 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ | |||
339 | int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ | 322 | int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \ |
340 | unsigned char *kstr, int klen, pem_password_cb *cb, void *u); | 323 | unsigned char *kstr, int klen, pem_password_cb *cb, void *u); |
341 | 324 | ||
342 | #endif | ||
343 | 325 | ||
344 | #ifndef OPENSSL_NO_BIO | 326 | #ifndef OPENSSL_NO_BIO |
345 | #define DECLARE_PEM_read_bio(name, type) \ | 327 | #define DECLARE_PEM_read_bio(name, type) \ |