diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
| commit | 91a178635ede7d286b8fd399269cdb159d960bb9 (patch) | |
| tree | b22c4be9efb7aff434e55c2f94b1ed61db565c5f /openssl/crypto/aes/aes_cbc.c | |
| parent | 1fba987eb45619d0b9487a9d671931e9eeedbb53 (diff) | |
| download | vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.tar.gz vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.tar.bz2 vcxsrv-91a178635ede7d286b8fd399269cdb159d960bb9.zip | |
Update openssl to version openssl-1.0.1m
Diffstat (limited to 'openssl/crypto/aes/aes_cbc.c')
| -rw-r--r-- | openssl/crypto/aes/aes_cbc.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/openssl/crypto/aes/aes_cbc.c b/openssl/crypto/aes/aes_cbc.c index 227f75625..e39231f17 100644 --- a/openssl/crypto/aes/aes_cbc.c +++ b/openssl/crypto/aes/aes_cbc.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -53,11 +53,14 @@ #include <openssl/modes.h> void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - size_t len, const AES_KEY *key, - unsigned char *ivec, const int enc) { + size_t len, const AES_KEY *key, + unsigned char *ivec, const int enc) +{ - if (enc) - CRYPTO_cbc128_encrypt(in,out,len,key,ivec,(block128_f)AES_encrypt); - else - CRYPTO_cbc128_decrypt(in,out,len,key,ivec,(block128_f)AES_decrypt); + if (enc) + CRYPTO_cbc128_encrypt(in, out, len, key, ivec, + (block128_f) AES_encrypt); + else + CRYPTO_cbc128_decrypt(in, out, len, key, ivec, + (block128_f) AES_decrypt); } |