diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
| commit | b8494591d1b1a143f3b192d845c238bbf3bc629d (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/aes.h | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.
Underlying issue was fixed.
Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/include/openssl/aes.h')
| -rw-r--r-- | src/include/openssl/aes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/openssl/aes.h b/src/include/openssl/aes.h index 84cde41..ed060ff 100644 --- a/src/include/openssl/aes.h +++ b/src/include/openssl/aes.h @@ -124,7 +124,7 @@ OPENSSL_EXPORT void AES_cbc_encrypt(const uint8_t *in, uint8_t *out, size_t len, const AES_KEY *key, uint8_t *ivec, const int enc); -/* AES_ofb128_encrypt encrypts (or decrypts, it's the same in CTR mode) |len| +/* AES_ofb128_encrypt encrypts (or decrypts, it's the same in OFB mode) |len| * bytes from |in| to |out|. The |num| parameter must be set to zero on the * first call. */ OPENSSL_EXPORT void AES_ofb128_encrypt(const uint8_t *in, uint8_t *out, |