diff options
author | jsing <> | 2016-09-04 16:22:54 +0000 |
---|---|---|
committer | jsing <> | 2016-09-04 16:22:54 +0000 |
commit | 77564480001eb3ef4e1db127ece07cd337c53d7d (patch) | |
tree | 20124815de00f4b36b34a22638613008c61b681c /src | |
parent | c29e0e7bf4ee4f4a903f455070be2bcaec93ff48 (diff) | |
download | openbsd-77564480001eb3ef4e1db127ece07cd337c53d7d.tar.gz openbsd-77564480001eb3ef4e1db127ece07cd337c53d7d.tar.bz2 openbsd-77564480001eb3ef4e1db127ece07cd337c53d7d.zip |
Place IMPLEMENT_PEM macros under #ifndef LIBRESSL_INTERNAL.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index 3a0d8b3576..d1916a1833 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem.h,v 1.16 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: pem.h,v 1.17 2016/09/04 16:22:54 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -201,12 +201,12 @@ typedef struct pem_ctx_st { | |||
201 | unsigned char *data; | 201 | unsigned char *data; |
202 | } PEM_CTX; | 202 | } PEM_CTX; |
203 | 203 | ||
204 | #ifndef LIBRESSL_INTERNAL | ||
204 | /* These macros make the PEM_read/PEM_write functions easier to maintain and | 205 | /* These macros make the PEM_read/PEM_write functions easier to maintain and |
205 | * write. Now they are all implemented with either: | 206 | * write. Now they are all implemented with either: |
206 | * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) | 207 | * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) |
207 | */ | 208 | */ |
208 | 209 | ||
209 | |||
210 | #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ | 210 | #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ |
211 | 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)\ |
212 | { \ | 212 | { \ |
@@ -306,6 +306,8 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ | |||
306 | IMPLEMENT_PEM_read(name, type, str, asn1) \ | 306 | IMPLEMENT_PEM_read(name, type, str, asn1) \ |
307 | IMPLEMENT_PEM_write_cb(name, type, str, asn1) | 307 | IMPLEMENT_PEM_write_cb(name, type, str, asn1) |
308 | 308 | ||
309 | #endif | ||
310 | |||
309 | /* These are the same except they are for the declarations */ | 311 | /* These are the same except they are for the declarations */ |
310 | 312 | ||
311 | 313 | ||