blob: a469fdf920d259ef6bc5eec587b2239fc2f964dc [file] [log] [blame]
diff -c -r orig/openssl-1.0.1c/crypto/jpake/jpake.c openssl-1.0.1c/crypto/jpake/jpake.c
*** orig/openssl-1.0.1c/crypto/jpake/jpake.c 2010-11-29 10:33:28.000000000 -0800
--- openssl-1.0.1c/crypto/jpake/jpake.c 2013-02-23 20:52:19.894730916 -0800
***************
*** 3,9 ****
--- 3,13 ----
#include <openssl/crypto.h>
#include <openssl/sha.h>
#include <openssl/err.h>
+ #if !defined(NO_MEMORY_H)
#include <memory.h>
+ #else
+ #include <string.h>
+ #endif
/*
* In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or
diff -c -r orig/openssl-1.0.1c/crypto/pkcs7/bio_pk7.c openssl-1.0.1c/crypto/pkcs7/bio_pk7.c
*** orig/openssl-1.0.1c/crypto/pkcs7/bio_pk7.c 2008-03-12 14:14:25.000000000 -0700
--- openssl-1.0.1c/crypto/pkcs7/bio_pk7.c 2013-02-23 20:53:07.895715316 -0800
***************
*** 57,63 ****
--- 57,67 ----
#include <openssl/bio.h>
#ifndef OPENSSL_SYSNAME_NETWARE
+ #if !defined(NO_MEMORY_H)
#include <memory.h>
+ #else
+ #include <string.h>
+ #endif
#endif
#include <stdio.h>