Renamed sha2.{c,h} to sha256.{c,h} and sha4.{c,h} to sha512.{c,h}

include/polarssl/entropy.h

@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include "sha4.h"
+#include "sha512.h"
 #if defined(POLARSSL_HAVEGE_C)
 #include "havege.h"
 #endif

include/polarssl/sha2.h → include/polarssl/sha256.h

 /**
- * \file sha2.h
+ * \file sha256.h
  *
  * \brief SHA-224 and SHA-256 cryptographic hash function
  *
@@ -24,8 +24,8 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef POLARSSL_SHA2_H
-#define POLARSSL_SHA2_H
+#ifndef POLARSSL_SHA256_H
+#define POLARSSL_SHA256_H
 
 #include "config.h"
 
@@ -96,7 +96,7 @@ void sha256_process( sha256_context *ctx, const unsigned char data[64] );
 #endif
 
 #else  /* POLARSSL_SHA256_ALT */
-#include "sha2_alt.h"
+#include "sha256_alt.h"
 #endif /* POLARSSL_SHA256_ALT */
 
 #ifdef __cplusplus
@@ -185,4 +185,4 @@ int sha256_self_test( int verbose );
 }
 #endif
 
-#endif /* sha2.h */
+#endif /* sha256.h */

include/polarssl/sha4.h → include/polarssl/sha512.h

 /**
- * \file sha4.h
+ * \file sha512.h
  *
  * \brief SHA-384 and SHA-512 cryptographic hash function
  *
@@ -24,8 +24,8 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef POLARSSL_SHA4_H
-#define POLARSSL_SHA4_H
+#ifndef POLARSSL_SHA512_H
+#define POLARSSL_SHA512_H
 
 #include "config.h"
 
@@ -94,7 +94,7 @@ void sha512_finish( sha512_context *ctx, unsigned char output[64] );
 #endif
 
 #else  /* POLARSSL_SHA512_ALT */
-#include "sha4_alt.h"
+#include "sha512_alt.h"
 #endif /* POLARSSL_SHA512_ALT */
 
 #ifdef __cplusplus
@@ -186,4 +186,4 @@ void sha512_process( sha512_context *ctx, const unsigned char data[128] );
 }
 #endif
 
-#endif /* sha4.h */
+#endif /* sha512.h */

include/polarssl/ssl.h

@@ -35,8 +35,8 @@
 
 #include "md5.h"
 #include "sha1.h"
-#include "sha2.h"
-#include "sha4.h"
+#include "sha256.h"
+#include "sha512.h"
 
 #include "ssl_ciphersuites.h"
 

library/CMakeLists.txt

@@ -39,8 +39,8 @@ set(src
      pkcs12.c
      rsa.c
      sha1.c
-     sha2.c
-     sha4.c
+     sha256.c
+     sha512.c
      ssl_cache.c
      ssl_ciphersuites.c
      ssl_cli.c 

library/Makefile

@@ -48,8 +48,8 @@ OBJS=	aes.o		arc4.o		asn1parse.o		\
 		oid.o									\
 		padlock.o	pbkdf2.o	pem.o			\
 		pkcs5.o		pkcs11.o	pkcs12.o		\
-		rsa.o		sha1.o		sha2.o			\
-		sha4.o		ssl_cache.o	ssl_cli.o		\
+		rsa.o		sha1.o		sha256.o		\
+		sha512.o	ssl_cache.o	ssl_cli.o		\
 		ssl_srv.o   ssl_ciphersuites.o			\
 		ssl_tls.o	timing.o	version.o		\
 		x509parse.o	x509write.o	xtea.o

library/error.c

@@ -130,11 +130,11 @@
 #endif
 
 #if defined(POLARSSL_SHA256_C)
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 #endif
 
 #if defined(POLARSSL_SHA512_C)
-#include "polarssl/sha4.h"
+#include "polarssl/sha512.h"
 #endif
 
 #if defined(POLARSSL_SSL_TLS_C)

library/md_wrap.c

@@ -50,11 +50,11 @@
 #endif
 
 #if defined(POLARSSL_SHA256_C)
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 #endif
 
 #if defined(POLARSSL_SHA512_C)
-#include "polarssl/sha4.h"
+#include "polarssl/sha512.h"
 #endif
 
 #include <stdlib.h>

library/sha2.c → library/sha256.c

@@ -32,7 +32,7 @@
 
 #if defined(POLARSSL_SHA256_C)
 
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
 #include <stdio.h>

library/sha4.c → library/sha512.c

@@ -32,7 +32,7 @@
 
 #if defined(POLARSSL_SHA512_C)
 
-#include "polarssl/sha4.h"
+#include "polarssl/sha512.h"
 
 #if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
 #include <stdio.h>

library/ssl_tls.c

@@ -41,7 +41,7 @@
 #include "polarssl/des.h"
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #if defined(POLARSSL_GCM_C)
 #include "polarssl/gcm.h"

library/x509parse.c

@@ -56,10 +56,10 @@
 #include "polarssl/sha1.h"
 #endif
 #if defined(POLARSSL_SHA256_C)
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 #endif
 #if defined(POLARSSL_SHA512_C)
-#include "polarssl/sha4.h"
+#include "polarssl/sha512.h"
 #endif
 #include "polarssl/dhm.h"
 #if defined(POLARSSL_PKCS5_C)

programs/aes/aescrypt2.c

@@ -45,7 +45,7 @@
 #include "polarssl/config.h"
 
 #include "polarssl/aes.h"
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #define MODE_ENCRYPT    0
 #define MODE_DECRYPT    1

programs/hash/sha2sum.c

 /*
  *  sha256sum demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -32,7 +32,7 @@
 
 #include "polarssl/config.h"
 
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #if !defined(POLARSSL_SHA256_C) || !defined(POLARSSL_FS_IO)
 int main( int argc, char *argv[] )

programs/test/benchmark.c

 /*
  *  Benchmark demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -36,8 +36,8 @@
 #include "polarssl/md4.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"
-#include "polarssl/sha2.h"
-#include "polarssl/sha4.h"
+#include "polarssl/sha256.h"
+#include "polarssl/sha512.h"
 #include "polarssl/arc4.h"
 #include "polarssl/des.h"
 #include "polarssl/aes.h"

programs/test/selftest.c

 /*
  *  Self-test demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -38,8 +38,8 @@
 #include "polarssl/md4.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"
-#include "polarssl/sha2.h"
-#include "polarssl/sha4.h"
+#include "polarssl/sha256.h"
+#include "polarssl/sha512.h"
 #include "polarssl/arc4.h"
 #include "polarssl/des.h"
 #include "polarssl/aes.h"

tests/suites/test_suite_hmac_shax.function

 BEGIN_HEADER
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_CASE

tests/suites/test_suite_md.function

@@ -4,8 +4,8 @@ BEGIN_HEADER
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_DEPENDENCIES

tests/suites/test_suite_pkcs1_v21.function

@@ -5,8 +5,8 @@ BEGIN_HEADER
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_DEPENDENCIES

tests/suites/test_suite_rsa.function

@@ -4,8 +4,8 @@ BEGIN_HEADER
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 #include <polarssl/entropy.h>
 #include <polarssl/ctr_drbg.h>
 END_HEADER