libbsd: Branch 'master'

Guillem Jover guillem at kemper.freedesktop.org
Mon Nov 30 18:44:57 PST 2015


 src/getentropy_aix.c   |    2 +-
 src/getentropy_hpux.c  |    3 ++-
 src/getentropy_linux.c |    3 ++-
 src/hash/sha512.h      |    2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2
Author: Guillem Jover <guillem at hadrons.org>
Date:   Tue Dec 1 03:39:10 2015 +0100

    Use local SHA512 header
    
    Actually use the local private SHA512 header instead of relying on the
    OpenSSL one for no good reason. Add definition for expected macro
    SHA512_DIGEST_LENGTH.

diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c
index cbd4037..d4ccab7 100644
--- a/src/getentropy_aix.c
+++ b/src/getentropy_aix.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <termios.h>
 
-#include <openssl/sha.h>
+#include "hash/sha512.h"
 
 #include <libperfstat.h>
 
diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c
index 45ac84b..294d83a 100644
--- a/src/getentropy_hpux.c
+++ b/src/getentropy_hpux.c
@@ -41,7 +41,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-#include <openssl/sha.h>
+
+#include "hash/sha512.h"
 
 #include <sys/vfs.h>
 
diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c
index 0a5d6b8..d7a8ae5 100644
--- a/src/getentropy_linux.c
+++ b/src/getentropy_linux.c
@@ -47,7 +47,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-#include <openssl/sha.h>
+
+#include "hash/sha512.h"
 
 #include <linux/types.h>
 #include <linux/random.h>
diff --git a/src/hash/sha512.h b/src/hash/sha512.h
index 43c5aaf..4f368a1 100644
--- a/src/hash/sha512.h
+++ b/src/hash/sha512.h
@@ -31,6 +31,8 @@
 
 #include <sys/types.h>
 
+#define SHA512_DIGEST_LENGTH		64
+
 typedef struct SHA512Context {
 	uint64_t state[8];
 	uint64_t count[2];


More information about the libbsd mailing list