Bug and warning fix1.1.1

Signed-off-by: Mattias Andrée <maandree@kth.se>

2 files changed, 4 insertions, 2 deletions

diff --git a/digest.c b/digest.c
index 0ad096c..b93526d 100644
--- a/digest.c
+++ b/digest.c
@@ -11,7 +11,7 @@ libsha1_digest(struct libsha1_state *restrict state, const void *message_, size_
 
 	if (msglen & ~(size_t)7) {
 		libsha1_update(state, message, msglen & ~(size_t)7);
-		message += msglen & ~(size_t)7;
+		message += msglen >> 3;
 		msglen &= (size_t)7;
 	}
 
diff --git a/process.c b/process.c
index 569afd8..9fd3357 100644
--- a/process.c
+++ b/process.c
@@ -275,6 +275,7 @@ have_sha_intrinsics(void)
 {
         static volatile int ret = -1;
         static volatile atomic_flag spinlock = ATOMIC_FLAG_INIT;
+	int a, b, c, d;
 
 	if (ret != -1)
 		return ret;
@@ -284,7 +285,8 @@ have_sha_intrinsics(void)
 	if (ret != -1)
 		goto out;
 
-	int a = 7, b, c = 0, d;
+	a = 7;
+	c = 0;
 	__asm__ volatile("cpuid" : "=a"(a), "=b"(b), "=c"(c), "=d"(d) : "a"(a), "c"(c));
 	if (!(b & (1 << 29))) {
 		ret = 0;