commit d2681d82e226d28d033390b61e94af04f0248dff
author Paul Bakker <p.j.bakker@polarssl.org> Sun Jun 30 14:49:12 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Jun 30 14:49:12 2013 +0200
tree c080ce9d46533035da7df74ceadeddeed44bcfe1
parent 9e36f0475f011912ee0897aa6487d7b9c190600e

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

library/CMakeLists.txt

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index bb80500..f702ea7 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -39,8 +39,8 @@
      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

diff --git a/library/Makefile b/library/Makefile
index dcc7477..a0e3105 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -48,8 +48,8 @@
 		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

diff --git a/library/error.c b/library/error.c
index 22a6371..7042bbd 100644
--- a/library/error.c
+++ b/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

diff --git a/library/md_wrap.c b/library/md_wrap.c
index 2621d22..d72852b 100644
--- a/library/md_wrap.c
+++ b/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/sha256.c

diff --git a/library/sha2.c b/library/sha256.c
similarity index 99%
rename from library/sha2.c
rename to library/sha256.c
index ffd00fc..e4d4842 100644
--- a/library/sha2.c
+++ b/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/sha512.c

diff --git a/library/sha4.c b/library/sha512.c
similarity index 99%
rename from library/sha4.c
rename to library/sha512.c
index 0710fab..2366e7c 100644
--- a/library/sha4.c
+++ b/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

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 6eeafc7..64d662e 100644
--- a/library/ssl_tls.c
+++ b/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

diff --git a/library/x509parse.c b/library/x509parse.c
index 6e37a85..3bc78c0 100644
--- a/library/x509parse.c
+++ b/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)