From: Dr. Stephen Henson Date: Mon, 9 Mar 2009 12:21:19 +0000 (+0000) Subject: Update from stable branch. X-Git-Tag: OpenSSL_0_9_8k^2~17 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4df100935f185476c4e84a68d0d5782377a46332;p=oweals%2Fopenssl.git Update from stable branch. --- diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index fc9804eea5..22231c26d3 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -213,7 +213,9 @@ typedef struct pem_ctx_st #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/ #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/ +#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/ #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/ +#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/ #else @@ -360,6 +362,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ #define DECLARE_PEM_read_bio(name, type) /**/ #define DECLARE_PEM_write_bio(name, type) /**/ +#define DECLARE_PEM_write_bio_const(name, type) /**/ #define DECLARE_PEM_write_cb_bio(name, type) /**/ #endif