diff options
author | Niels Möller <nisse@lysator.liu.se> | 2012-12-02 21:39:33 +0100 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2012-12-02 21:39:33 +0100 |
commit | 111518dde5d1544b3d103d7f11000b28f78aaa09 (patch) | |
tree | 88c907bbd2463fe7611610652e9566c100dd4bf1 | |
parent | f9ef3299b54a58ef1e25393f8ae42456bad1c4c2 (diff) | |
download | nettle-111518dde5d1544b3d103d7f11000b28f78aaa09.tar.gz |
Replaced all internal usage of sha.h.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | dsa.h | 3 | ||||
-rw-r--r-- | examples/nettle-benchmark.c | 3 | ||||
-rw-r--r-- | hmac.h | 3 | ||||
-rw-r--r-- | rsa.h | 3 | ||||
-rw-r--r-- | sha-example.c | 2 | ||||
-rw-r--r-- | sha1-compress.c | 2 | ||||
-rw-r--r-- | sha1-meta.c | 2 | ||||
-rw-r--r-- | sha1.c | 2 | ||||
-rw-r--r-- | sha224-meta.c | 2 | ||||
-rw-r--r-- | sha256-compress.c | 2 | ||||
-rw-r--r-- | sha256-meta.c | 2 | ||||
-rw-r--r-- | sha256.c | 2 | ||||
-rw-r--r-- | sha384-meta.c | 2 | ||||
-rw-r--r-- | sha512-compress.c | 2 | ||||
-rw-r--r-- | sha512-meta.c | 2 | ||||
-rw-r--r-- | sha512.c | 2 | ||||
-rw-r--r-- | testsuite/pbkdf2-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha1-huge-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha1-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha224-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha256-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha384-test.c | 1 | ||||
-rw-r--r-- | testsuite/sha512-test.c | 1 | ||||
-rw-r--r-- | yarrow.h | 2 |
25 files changed, 23 insertions, 25 deletions
@@ -1,6 +1,7 @@ 2012-12-02 Niels Möller <nisse@lysator.liu.se> - Split sha.h into new files sha1.h and sha2.h. + Split sha.h into new files sha1.h and sha2.h. Replaced all + internal usage of sha.h in all files. * sha.h: Kept for compatibility, just includes both new files. * sha1.h: New file. * sha2.h: New file. @@ -30,7 +30,8 @@ #include "nettle-types.h" -#include "sha.h" +#include "sha1.h" +#include "sha2.h" #ifdef __cplusplus extern "C" { diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c index d3da1bca..7b0171c5 100644 --- a/examples/nettle-benchmark.c +++ b/examples/nettle-benchmark.c @@ -49,7 +49,8 @@ #include "memxor.h" #include "salsa20.h" #include "serpent.h" -#include "sha.h" +#include "sha1.h" +#include "sha2.h" #include "sha3.h" #include "twofish.h" @@ -30,7 +30,8 @@ #include "md5.h" #include "ripemd160.h" -#include "sha.h" +#include "sha1.h" +#include "sha2.h" #ifdef __cplusplus extern "C" { @@ -30,7 +30,8 @@ #include "nettle-types.h" #include "md5.h" -#include "sha.h" +#include "sha1.h" +#include "sha2.h" #ifdef __cplusplus extern "C" { diff --git a/sha-example.c b/sha-example.c index 8b3d5059..dcd889c7 100644 --- a/sha-example.c +++ b/sha-example.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include <nettle/sha.h> +#include <nettle/sha1.h> #define BUF_SIZE 1000 diff --git a/sha1-compress.c b/sha1-compress.c index d1961744..afdfe8e8 100644 --- a/sha1-compress.c +++ b/sha1-compress.c @@ -55,7 +55,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha1.h" #include "macros.h" diff --git a/sha1-meta.c b/sha1-meta.c index 9a051bda..60c2bb58 100644 --- a/sha1-meta.c +++ b/sha1-meta.c @@ -26,7 +26,7 @@ #include "nettle-meta.h" -#include "sha.h" +#include "sha1.h" const struct nettle_hash nettle_sha1 = _NETTLE_HASH(sha1, SHA1); @@ -44,7 +44,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha1.h" #include "macros.h" #include "nettle-write.h" diff --git a/sha224-meta.c b/sha224-meta.c index 8c6d9fbc..27b29102 100644 --- a/sha224-meta.c +++ b/sha224-meta.c @@ -26,7 +26,7 @@ #include "nettle-meta.h" -#include "sha.h" +#include "sha2.h" const struct nettle_hash nettle_sha224 = _NETTLE_HASH(sha224, SHA224); diff --git a/sha256-compress.c b/sha256-compress.c index 7d449297..3f441e81 100644 --- a/sha256-compress.c +++ b/sha256-compress.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha2.h" #include "macros.h" diff --git a/sha256-meta.c b/sha256-meta.c index 65923103..5c882b7b 100644 --- a/sha256-meta.c +++ b/sha256-meta.c @@ -26,7 +26,7 @@ #include "nettle-meta.h" -#include "sha.h" +#include "sha2.h" const struct nettle_hash nettle_sha256 = _NETTLE_HASH(sha256, SHA256); @@ -35,7 +35,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha2.h" #include "macros.h" #include "nettle-write.h" diff --git a/sha384-meta.c b/sha384-meta.c index 18603443..e5a7ab3f 100644 --- a/sha384-meta.c +++ b/sha384-meta.c @@ -26,7 +26,7 @@ #include "nettle-meta.h" -#include "sha.h" +#include "sha2.h" const struct nettle_hash nettle_sha384 = _NETTLE_HASH(sha384, SHA384); diff --git a/sha512-compress.c b/sha512-compress.c index 901b6cf4..9dd34f4c 100644 --- a/sha512-compress.c +++ b/sha512-compress.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha2.h" #include "macros.h" diff --git a/sha512-meta.c b/sha512-meta.c index cfc485d3..cb62762c 100644 --- a/sha512-meta.c +++ b/sha512-meta.c @@ -26,7 +26,7 @@ #include "nettle-meta.h" -#include "sha.h" +#include "sha2.h" const struct nettle_hash nettle_sha512 = _NETTLE_HASH(sha512, SHA512); @@ -35,7 +35,7 @@ #include <stdlib.h> #include <string.h> -#include "sha.h" +#include "sha2.h" #include "macros.h" diff --git a/testsuite/pbkdf2-test.c b/testsuite/pbkdf2-test.c index ffb55807..e3cf9539 100644 --- a/testsuite/pbkdf2-test.c +++ b/testsuite/pbkdf2-test.c @@ -1,6 +1,5 @@ #include "testutils.h" #include "hmac.h" -#include "sha.h" #include "pbkdf2.h" /* NOTE: The salt argument is expected to expand to length, data */ diff --git a/testsuite/sha1-huge-test.c b/testsuite/sha1-huge-test.c index 6557eadc..156a762a 100644 --- a/testsuite/sha1-huge-test.c +++ b/testsuite/sha1-huge-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) diff --git a/testsuite/sha1-test.c b/testsuite/sha1-test.c index 5f39c0fc..8356555b 100644 --- a/testsuite/sha1-test.c +++ b/testsuite/sha1-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) diff --git a/testsuite/sha224-test.c b/testsuite/sha224-test.c index 8a001007..eb20c300 100644 --- a/testsuite/sha224-test.c +++ b/testsuite/sha224-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) diff --git a/testsuite/sha256-test.c b/testsuite/sha256-test.c index 43adcc2b..e625c56d 100644 --- a/testsuite/sha256-test.c +++ b/testsuite/sha256-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) diff --git a/testsuite/sha384-test.c b/testsuite/sha384-test.c index 7b94fa48..13a02144 100644 --- a/testsuite/sha384-test.c +++ b/testsuite/sha384-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) diff --git a/testsuite/sha512-test.c b/testsuite/sha512-test.c index 490935b8..853d5b82 100644 --- a/testsuite/sha512-test.c +++ b/testsuite/sha512-test.c @@ -1,5 +1,4 @@ #include "testutils.h" -#include "sha.h" void test_main(void) @@ -27,7 +27,7 @@ #define NETTLE_YARROW_H_INCLUDED #include "aes.h" -#include "sha.h" +#include "sha2.h" #ifdef __cplusplus extern "C" { |