Merge pull request #4275 from mrezai/openssl-1.0.1s

Update OpenSSL to version 1.0.1s

1 files changed, 50 insertions, 56 deletions

diff --git a/drivers/builtin_openssl2/crypto/sha/sha.c b/drivers/builtin_openssl2/crypto/sha/sha.c
index 42126551d1..cfc12f3edc 100644
--- a/drivers/builtin_openssl2/crypto/sha/sha.c
+++ b/drivers/builtin_openssl2/crypto/sha/sha.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -60,65 +60,59 @@
 #include <stdlib.h>
 #include <openssl/sha.h>
 
-#define BUFSIZE	1024*16
+#define BUFSIZE 1024*16
 
 void do_fp(FILE *f);
 void pt(unsigned char *md);
 int read(int, void *, unsigned int);
 int main(int argc, char **argv)
-	{
-	int i,err=0;
-	FILE *IN;
+{
+    int i, err = 0;
+    FILE *IN;
 
-	if (argc == 1)
-		{
-		do_fp(stdin);
-		}
-	else
-		{
-		for (i=1; i<argc; i++)
-			{
-			IN=fopen(argv[i],"r");
-			if (IN == NULL)
-				{
-				perror(argv[i]);
-				err++;
-				continue;
-				}
-			printf("SHA(%s)= ",argv[i]);
-			do_fp(IN);
-			fclose(IN);
-			}
-		}
-	exit(err);
-	}
+    if (argc == 1) {
+        do_fp(stdin);
+    } else {
+        for (i = 1; i < argc; i++) {
+            IN = fopen(argv[i], "r");
+            if (IN == NULL) {
+                perror(argv[i]);
+                err++;
+                continue;
+            }
+            printf("SHA(%s)= ", argv[i]);
+            do_fp(IN);
+            fclose(IN);
+        }
+    }
+    exit(err);
+}
 
 void do_fp(FILE *f)
-	{
-	SHA_CTX c;
-	unsigned char md[SHA_DIGEST_LENGTH];
-	int fd;
-	int i;
-	unsigned char buf[BUFSIZE];
+{
+    SHA_CTX c;
+    unsigned char md[SHA_DIGEST_LENGTH];
+    int fd;
+    int i;
+    unsigned char buf[BUFSIZE];
 
-	fd=fileno(f);
-	SHA_Init(&c);
-	for (;;)
-		{
-		i=read(fd,buf,BUFSIZE);
-		if (i <= 0) break;
-		SHA_Update(&c,buf,(unsigned long)i);
-		}
-	SHA_Final(&(md[0]),&c);
-	pt(md);
-	}
+    fd = fileno(f);
+    SHA_Init(&c);
+    for (;;) {
+        i = read(fd, buf, BUFSIZE);
+        if (i <= 0)
+            break;
+        SHA_Update(&c, buf, (unsigned long)i);
+    }
+    SHA_Final(&(md[0]), &c);
+    pt(md);
+}
 
 void pt(unsigned char *md)
-	{
-	int i;
-
-	for (i=0; i<SHA_DIGEST_LENGTH; i++)
-		printf("%02x",md[i]);
-	printf("\n");
-	}
+{
+    int i;
 
+    for (i = 0; i < SHA_DIGEST_LENGTH; i++)
+        printf("%02x", md[i]);
+    printf("\n");
+}