OpenSSL 0.9.4 merge

1 files changed, 4 insertions, 15 deletions

diff --git a/src/lib/libcrypto/sha/sha.c b/src/lib/libcrypto/sha/sha.c
index 713fec3610..42126551d1 100644
--- a/src/lib/libcrypto/sha/sha.c
+++ b/src/lib/libcrypto/sha/sha.c
@@ -58,23 +58,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "sha.h"
+#include <openssl/sha.h>
 
 #define BUFSIZE 1024*16
 
-#ifndef NOPROTO
 void do_fp(FILE *f);
 void pt(unsigned char *md);
 int read(int, void *, unsigned int);
-#else
-void do_fp();
-void pt();
-int read();
-#endif
-
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
         {
         int i,err=0;
         FILE *IN;
@@ -102,8 +93,7 @@ char **argv;
         exit(err);
         }
 
-void do_fp(f)
-FILE *f;
+void do_fp(FILE *f)
         {
         SHA_CTX c;
         unsigned char md[SHA_DIGEST_LENGTH];
@@ -123,8 +113,7 @@ FILE *f;
         pt(md);
         }
 
-void pt(md)
-unsigned char *md;
+void pt(unsigned char *md)
         {
         int i;