srtp msvc updates and cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1087 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2006-04-07 16:34:02 +00:00
parent b3d890ef25
commit abda472017
66 changed files with 30 additions and 220 deletions
-6
View File
@@ -1,6 +0,0 @@
/aes.c/1.8/Sat Oct 8 16:39:25 2005//
/aes_cbc.c/1.5/Sat Oct 8 16:38:06 2005//
/aes_icm.c/1.10/Thu Mar 16 17:11:29 2006//
/cipher.c/1.4/Mon Oct 3 15:27:53 2005//
/null_cipher.c/1.2/Thu Sep 29 12:36:43 2005//
D
-1
View File
@@ -1 +0,0 @@
srtp/crypto/cipher
-1
View File
@@ -1 +0,0 @@
:pserver:anonymous@cvs.sourceforge.net:/cvsroot/srtp
+2 -2
View File
@@ -1358,7 +1358,7 @@ static uint32_t U4[256] = {
extern debug_module_t mod_aes_icm;
inline void
void
aes_expand_encryption_key(const v128_t *key,
aes_expanded_key_t expanded_key) {
int i;
@@ -1411,7 +1411,7 @@ aes_expand_encryption_key(const v128_t *key,
}
}
inline void
void
aes_expand_decryption_key(const v128_t *key,
aes_expanded_key_t expanded_key) {
int i;
+2 -2
View File
@@ -208,7 +208,7 @@ aes_icm_set_octet(aes_icm_ctx_t *c,
((high32(octet_num) & 0x0f)<<(32-4)) |
(low32(octet_num) >> 4));
#else
int tail_num = octet_num % 16;
int tail_num = (int)(octet_num % 16);
uint64_t block_num = octet_num / 16;
#endif
@@ -329,7 +329,7 @@ aes_icm_encrypt_ismacryp(aes_icm_ctx_t *c,
unsigned char *buf, unsigned int *enc_len,
int forIsmacryp) {
unsigned int bytes_to_encr = *enc_len;
int i;
unsigned int i;
uint32_t *b;
/* check that there's enough segment left but not for ismacryp*/
+1 -1
View File
@@ -283,7 +283,7 @@ cipher_type_self_test(const cipher_type_t *ct) {
octet_string_hex_string(buffer, length));
/* copy plaintext into second buffer */
for (i=0; i < length; i++)
for (i=0; (unsigned int)i < length; i++)
buffer2[i] = buffer[i];
/* choose a key at random */