[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  739fe504e81666e4bd24a5b76d07dabf500d4b73 (commit)
      from  16938284cf5bba32006925281cb28b04d166a234 (commit)


- Log -----------------------------------------------------------------
commit 739fe504e81666e4bd24a5b76d07dabf500d4b73
Author: Dániel Bakai <daniel.bakai at tresorit.com>
Date:   Thu Aug 4 13:00:48 2016 +0200

    Added appropriate OPENSSL_NO_STDIO to PKCS12 header
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/pkcs12.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h
index a1e9d1d..4711dfa 100644
--- a/include/openssl/pkcs12.h
+++ b/include/openssl/pkcs12.h
@@ -201,9 +201,13 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
 PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
 
 int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
+# ifndef OPENSSL_NO_STDIO
 int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
+# endif
 PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
+# ifndef OPENSSL_NO_STDIO
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
+# endif
 int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass);
 
 /* BEGIN ERROR CODES */