summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index f40bcf8bd3..fb767d9619 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes.c,v 1.22 2014/06/15 22:53:21 tedu Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.23 2014/07/10 22:45:57 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -49,16 +49,19 @@
49 * 49 *
50 */ 50 */
51 51
52#include <assert.h>
53#include <string.h>
54
52#include <openssl/opensslconf.h> 55#include <openssl/opensslconf.h>
56
53#ifndef OPENSSL_NO_AES 57#ifndef OPENSSL_NO_AES
54#include <openssl/evp.h>
55#include <openssl/err.h>
56#include <string.h>
57#include <assert.h>
58#include <openssl/aes.h> 58#include <openssl/aes.h>
59#include <openssl/err.h>
60#include <openssl/evp.h>
61#include <openssl/rand.h>
62
59#include "evp_locl.h" 63#include "evp_locl.h"
60#include "modes_lcl.h" 64#include "modes_lcl.h"
61#include <openssl/rand.h>
62 65
63typedef struct { 66typedef struct {
64 AES_KEY ks; 67 AES_KEY ks;