From: Bodo Möller <bodo@openssl.org>
Date: Wed, 20 Nov 2002 14:14:45 +0000 (+0000)
Subject: avoid uninitialized memory read
X-Git-Tag: OpenSSL_0_9_7-beta5~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=134fea9d0f2584cf222cd1630cf97e19a82aff35;p=oweals%2Fopenssl.git

avoid uninitialized memory read

Submitted by: Nils Larsch
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index c323fa2892..fe8bcda631 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -52,7 +52,6 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <string.h>
-#include <assert.h>
 #include <openssl/aes.h>
 #include "evp_locl.h"
 
diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 353d2b96ad..86e41bf6df 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -1,6 +1,6 @@
 /* crypto/md32_common.h */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -456,7 +456,10 @@ int HASH_UPDATE (HASH_CTX *c, const void *data_, unsigned long len)
 				{
 				ew=(c->num>>2);
 				ec=(c->num&0x03);
-				l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
+				if (sc)
+					l=p[sw];
+				HOST_p_c2l(data,l,sc);
+				p[sw++]=l;
 				for (; sw < ew; sw++)
 					{
 					HOST_c2l(data,l); p[sw]=l;