Don't leak VLANClientState on PCI hot remove

[qemu.git] / aes.c

diff --git a/aes.c b/aes.c
index cd4484ff9b4ec7f4e8cd09b75d8e90f14b16349a..37008947f4ed547e0324618b06b1c6e5713dafbe 100644 (file)
--- a/aes.c
+++ b/aes.c
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * aes.c - integrated in QEMU by Fabrice Bellard from the OpenSSL project.
  */
 /*
@@ -27,10 +27,13 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "vl.h"
+#include "qemu-common.h"
 #include "aes.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
+
 #include <assert.h>
 
 typedef uint32_t u32;
@@ -1267,7 +1270,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                     const unsigned long length, const AES_KEY *key,
-                    unsigned char *ivec, const int enc) 
+                    unsigned char *ivec, const int enc)
 {
 
        unsigned long n;
@@ -1294,7 +1297,7 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                        AES_encrypt(tmp, tmp, key);
                        memcpy(out, tmp, AES_BLOCK_SIZE);
                        memcpy(ivec, tmp, AES_BLOCK_SIZE);
-               }                       
+               }
        } else {
                while (len >= AES_BLOCK_SIZE) {
                        memcpy(tmp, in, AES_BLOCK_SIZE);
@@ -1312,6 +1315,6 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                        for(n=0; n < len; ++n)
                                out[n] = tmp[n] ^ ivec[n];
                        memcpy(ivec, tmp, AES_BLOCK_SIZE);
-               }                       
+               }
        }
 }