commit f0f1d2ac3012840003f31be55b8f273b489a8999
Author: Adam Langley <agl@chromium.org>
Date:   Mon May 20 12:50:05 2013 -0400

    Build fixes.

diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 53262fa..4b6ab77 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -381,21 +381,21 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 #ifdef BSWAP
 			pmac->u[0] = BSWAP(pmac->u[0]);
 			pmac->u[1] = BSWAP(pmac->u[1]);
 			pmac->u[2] = BSWAP(pmac->u[2]);
 			pmac->u[3] = BSWAP(pmac->u[3]);
 			pmac->u[4] = BSWAP(pmac->u[4]);
 			pmac->u[5] = BSWAP(pmac->u[5]);
 			pmac->u[6] = BSWAP(pmac->u[6]);
 			pmac->u[7] = BSWAP(pmac->u[7]);
 #else
-			for (i=0;i<8;;i++) {
+			for (i=0;i<8;i++) {
 				res = pmac->u[i];
 				pmac->c[4*i+0]=(unsigned char)(res>>24);
 				pmac->c[4*i+1]=(unsigned char)(res>>16);
 				pmac->c[4*i+2]=(unsigned char)(res>>8);
 				pmac->c[4*i+3]=(unsigned char)res;
 			}
 #endif
 			len += SHA256_DIGEST_LENGTH;
 #else
 			SHA256_Update(&key->md,out,inp_len);
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 50b5682..ad6089f 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -838,20 +838,24 @@ const EVP_CIPHER *EVP_aes_256_cfb128(void);
 # define EVP_aes_256_cfb EVP_aes_256_cfb128
 const EVP_CIPHER *EVP_aes_256_ofb(void);
 const EVP_CIPHER *EVP_aes_256_ctr(void);
 const EVP_CIPHER *EVP_aes_256_ccm(void);
 const EVP_CIPHER *EVP_aes_256_gcm(void);
 const EVP_CIPHER *EVP_aes_256_xts(void);
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
 #endif
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256)
+const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void);
+const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void);
+#endif
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 const EVP_CIPHER *EVP_camellia_128_ecb(void);
 const EVP_CIPHER *EVP_camellia_128_cbc(void);
 const EVP_CIPHER *EVP_camellia_128_cfb1(void);
 const EVP_CIPHER *EVP_camellia_128_cfb8(void);
 const EVP_CIPHER *EVP_camellia_128_cfb128(void);
 # define EVP_camellia_128_cfb EVP_camellia_128_cfb128
 const EVP_CIPHER *EVP_camellia_128_ofb(void);
 const EVP_CIPHER *EVP_camellia_192_ecb(void);