diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-09-04 16:22:55 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-09-04 16:22:55 +0000 |
| commit | 6f76de62bcee9e4fe192031516b733987891ce48 (patch) | |
| tree | de0726af8c0ab3a7c3d897dcb591d80ecb5721f7 /lib | |
| parent | 240b0df14655a608cf18947b63f783a1903510d9 (diff) | |
Place IMPLEMENT_PEM macros under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/pem/pem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h index 3a0d8b35761..d1916a18335 100644 --- a/lib/libcrypto/pem/pem.h +++ b/lib/libcrypto/pem/pem.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pem.h,v 1.16 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: pem.h,v 1.17 2016/09/04 16:22:54 jsing Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -201,12 +201,12 @@ typedef struct pem_ctx_st { unsigned char *data; } PEM_CTX; +#ifndef LIBRESSL_INTERNAL /* These macros make the PEM_read/PEM_write functions easier to maintain and * write. Now they are all implemented with either: * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) */ - #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ { \ @@ -306,6 +306,8 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ IMPLEMENT_PEM_read(name, type, str, asn1) \ IMPLEMENT_PEM_write_cb(name, type, str, asn1) +#endif + /* These are the same except they are for the declarations */ |