[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  9dff24e43a20e713f4a3fdcb35b8f1de02f0baae (commit)
      from  6865dea2d657f75625fdd03408bac4408c660f5e (commit)


- Log -----------------------------------------------------------------
commit 9dff24e43a20e713f4a3fdcb35b8f1de02f0baae
Author: Bjoern D. Rasmussen <contact at bearware.dk>
Date:   Sun May 10 07:51:29 2015 +0200

    Fix for memcpy() and strcmp() being undefined.
    
    clang says: "s_cb.c:958:9: error: implicitly declaring library function
    'memcpy'"
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 8f744cceff5bce8cb00a6ddd739c1bbb85c142ea)
    
    Conflicts:
    	apps/s_cb.c

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

Summary of changes:
 apps/s_cb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 9ab11cf..fabf9cf 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -111,6 +111,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h> /* for memcpy() */
 #define USE_SOCKETS
 #define NON_MAIN
 #include "apps.h"