From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Oct 2002 22:42:34 +0000 (+0000)
Subject: Add more commentary.  Check that *num is smaller than the block size.
X-Git-Tag: OpenSSL_0_9_7-beta4~109^2~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4006c56036b1a2613acc77ff60c3c71e62aae962;p=oweals%2Fopenssl.git

Add more commentary.  Check that *num is smaller than the block size.
---

diff --git a/crypto/aes/aes_ctr.c b/crypto/aes/aes_ctr.c
index 6a89f4def2..142ca4a142 100644
--- a/crypto/aes/aes_ctr.c
+++ b/crypto/aes/aes_ctr.c
@@ -90,7 +90,10 @@ static void AES_ctr128_inc(unsigned char *counter) {
 
 /* The input encrypted as though 128bit counter mode is being
  * used.  The extra state information to record how much of the
- * 128bit block we have used is contained in *num;
+ * 128bit block we have used is contained in *num, and the
+ * encrypted counter is kept in ecount_buf.  Both *num and
+ * ecount_buf must be initialised with zeros before the first
+ * call to AES_ctr128_encrypt().
  */
 void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 	const unsigned long length, const AES_KEY *key,
@@ -102,6 +105,7 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 	unsigned long l=length;
 
 	assert(in && out && key && counter && num);
+	assert(*num < AES_BLOCK_SIZE);
 
 	n = *num;