Update openssl to version openssl-1.0.1m

Conflicts:
	openssl/Makefile
	openssl/Makefile.bak
	openssl/crypto/cryptlib.c

1 files changed, 16 insertions, 18 deletions

diff --git a/openssl/crypto/o_dir_test.c b/openssl/crypto/o_dir_test.c
index 3d75ecb00..7cdbbbc40 100644
--- a/openssl/crypto/o_dir_test.c
+++ b/openssl/crypto/o_dir_test.c
@@ -1,5 +1,6 @@
 /* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */
-/* Copied from Richard Levitte's (richard@levitte.org) LP library.  All
+/*
+ * Copied from Richard Levitte's (richard@levitte.org) LP library.  All
  * symbol names have been changed, with permission from the author.
  */
 
@@ -38,33 +39,30 @@
 #include "o_dir.h"
 
 #if defined OPENSSL_SYS_UNIX || defined OPENSSL_SYS_WIN32 || defined OPENSSL_SYS_WINCE
-#define CURRDIR "."
+# define CURRDIR "."
 #elif defined OPENSSL_SYS_VMS
-#define CURRDIR "SYS$DISK:[]"
+# define CURRDIR "SYS$DISK:[]"
 #else
-#error "No supported platform defined!"
+# error "No supported platform defined!"
 #endif
 
 int main()
 {
-  OPENSSL_DIR_CTX *ctx = NULL;
-  const char *result;
+    OPENSSL_DIR_CTX *ctx = NULL;
+    const char *result;
 
-  while((result = OPENSSL_DIR_read(&ctx, CURRDIR)) != NULL)
-    {
-      printf("%s\n", result);
+    while ((result = OPENSSL_DIR_read(&ctx, CURRDIR)) != NULL) {
+        printf("%s\n", result);
     }
 
-  if (errno)
-    {
-      perror("test_dir");
-      exit(1);
+    if (errno) {
+        perror("test_dir");
+        exit(1);
     }
 
-  if (!OPENSSL_DIR_end(&ctx))
-    {
-      perror("test_dir");
-      exit(2);
+    if (!OPENSSL_DIR_end(&ctx)) {
+        perror("test_dir");
+        exit(2);
     }
-  exit(0);
+    exit(0);
 }