projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Permit nested ASN1 string encoding but with a maximum depth to avoid
[oweals/openssl.git]
/
crypto
/
aes
/
aes_cbc.c
diff --git
a/crypto/aes/aes_cbc.c
b/crypto/aes/aes_cbc.c
index d2ba6bcdb4659d1ed9c6a01a898b08e167e0f2ef..373864cd4bdb9cdf387d5d620e22361aed76b61e 100644
(file)
--- a/
crypto/aes/aes_cbc.c
+++ b/
crypto/aes/aes_cbc.c
@@
-59,6
+59,7
@@
#include <openssl/aes.h>
#include "aes_locl.h"
+#if !defined(OPENSSL_FIPS_AES_ASM)
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) {
@@
-129,3
+130,4
@@
void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
}
}
}
+#endif