Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: srtp/crypto/include/aes_cbc.h

Issue 889083003: Update libsrtp to upstream 1.5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libsrtp@master
Patch Set: Updated to libsrtp 1.5.1 Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « srtp/crypto/include/aes.h ('k') | srtp/crypto/include/aes_gcm_ossl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: srtp/crypto/include/aes_cbc.h
diff --git a/srtp/crypto/include/aes_cbc.h b/srtp/crypto/include/aes_cbc.h
index 6436b5b1796735b78b745795eac29981a785d20e..4fda39031177e57aaddc77ec4099149bfd1a7a8e 100644
--- a/srtp/crypto/include/aes_cbc.h
+++ b/srtp/crypto/include/aes_cbc.h
@@ -7,6 +7,7 @@
* Cisco Systems, Inc.
*
*/
+
/*
*
* Copyright (c) 2001-2006, Cisco Systems, Inc.
@@ -52,6 +53,8 @@
typedef struct {
v128_t state; /* cipher chaining state */
v128_t previous; /* previous ciphertext block */
+ uint8_t key[32];
+ int key_len;
aes_expanded_key_t expanded_key; /* the cipher key */
} aes_cbc_ctx_t;
@@ -66,10 +69,10 @@ aes_cbc_encrypt(aes_cbc_ctx_t *c,
err_status_t
aes_cbc_context_init(aes_cbc_ctx_t *c, const uint8_t *key,
- int key_len, cipher_direction_t dir);
+ int key_len);
err_status_t
-aes_cbc_set_iv(aes_cbc_ctx_t *c, void *iv);
+aes_cbc_set_iv(aes_cbc_ctx_t *c, void *iv, int direction);
err_status_t
aes_cbc_nist_encrypt(aes_cbc_ctx_t *c,
« no previous file with comments | « srtp/crypto/include/aes.h ('k') | srtp/crypto/include/aes_gcm_ossl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698