srtp-cvs — automated CVS commit notifications

[Srtp-cvs] srtp configure,1.11,1.12 configure.in,1.12,1.13

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp
In directory vz-cvs-3.sog:/tmp/cvs-serv9874

Modified Files:
	configure configure.in 
Log Message:
Treat x86_64 platforms as HAVE_X86 in configure.  (The limited amount of x86 inline
assembly libsrtp uses works on both 32-bit and 64-bit x86.)


Index: configure
===================================================================
RCS file: /cvsroot/srtp/srtp/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure	17 May 2010 19:32:02 -0000	1.11
--- configure	26 Apr 2012 23:17:21 -0000	1.12
***************
*** 2708,2712 ****
  
  case $host_cpu in
!      i*86 )
  
  cat >>confdefs.h <<\_ACEOF
--- 2708,2712 ----
  
  case $host_cpu in
!      i*86 | x86_64 )
  
  cat >>confdefs.h <<\_ACEOF

Index: configure.in
===================================================================
RCS file: /cvsroot/srtp/srtp/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configure.in	17 May 2010 19:32:02 -0000	1.12
--- configure.in	26 Apr 2012 23:17:21 -0000	1.13
***************
*** 20,24 ****
  dnl check host_cpu type, set defines appropriately
  case $host_cpu in
!      i*86 )
  	AC_DEFINE(CPU_CISC, 1,
  	   [Define if building for a CISC machine (e.g. Intel).])
--- 20,24 ----
  dnl check host_cpu type, set defines appropriately
  case $host_cpu in
!      i*86 | x86_64 )
  	AC_DEFINE(CPU_CISC, 1,
  	   [Define if building for a CISC machine (e.g. Intel).])

[Srtp-cvs] srtp/srtp srtp.c,1.35,1.36

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/srtp
In directory vz-cvs-3.sog:/tmp/cvs-serv9796/srtp

Modified Files:
	srtp.c 
Log Message:
Call debug_print for key and salt values separately, for both SRTP and SRTCP,
instead of printing them as one long string.


Index: srtp.c
===================================================================
RCS file: /cvsroot/srtp/srtp/srtp/srtp.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** srtp.c	27 Oct 2011 16:06:13 -0000	1.35
--- srtp.c	26 Apr 2012 23:16:00 -0000	1.36
***************
*** 464,468 ****
    }
    debug_print(mod_srtp, "cipher key: %s", 
! 	      octet_string_hex_string(tmp_key, rtp_keylen));
  
    /* initialize cipher */
--- 464,472 ----
    }
    debug_print(mod_srtp, "cipher key: %s", 
! 	      octet_string_hex_string(tmp_key, rtp_base_key_len));
!   if (rtp_salt_len > 0) {
!     debug_print(mod_srtp, "cipher salt: %s",
! 		octet_string_hex_string(tmp_key + rtp_base_key_len, rtp_salt_len));
!   }
  
    /* initialize cipher */
***************
*** 528,532 ****
    }
    debug_print(mod_srtp, "rtcp cipher key: %s", 
! 	      octet_string_hex_string(tmp_key, rtcp_keylen));  
  
    /* initialize cipher */
--- 532,540 ----
    }
    debug_print(mod_srtp, "rtcp cipher key: %s", 
! 	      octet_string_hex_string(tmp_key, rtcp_base_key_len));  
!   if (rtcp_salt_len > 0) {
!     debug_print(mod_srtp, "rtcp cipher salt: %s",
! 		octet_string_hex_string(tmp_key + rtcp_base_key_len, rtcp_salt_len));
!   }
  
    /* initialize cipher */

[Srtp-cvs] srtp/test roc_driver.c,1.3,1.4

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/test
In directory vz-cvs-3.sog:/tmp/cvs-serv9748/test

Modified Files:
	roc_driver.c 
Log Message:
Fix inverted sign of delta return value of index_guess when sequence numbers
were rolling backwards across a sequence number rollover.

Add a test to roc_driver to detect this problem (by validating that delta makes
sense).


Index: roc_driver.c
===================================================================
RCS file: /cvsroot/srtp/srtp/test/roc_driver.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roc_driver.c	8 Jun 2006 17:00:30 -0000	1.3
--- roc_driver.c	26 Apr 2012 23:14:48 -0000	1.4
***************
*** 139,142 ****
--- 139,148 ----
  #endif
      
+     if (local + delta != est) {
+       printf(" *bad delta*: local %llu + delta %d != est %llu\n",
+ 	     (unsigned long long)local, delta, (unsigned long long)est);
+       return err_status_algo_fail;
+     }
+ 
      /* now update local xtd_seq_num_t as necessary */
      if (delta > 0) 

[Srtp-cvs] srtp/crypto/cipher aes_icm.c,1.19,1.20

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/cipher
In directory vz-cvs-3.sog:/tmp/cvs-serv17730/crypto/cipher

Modified Files:
	aes_icm.c 
Log Message:
Fix inline functions when compiling as C99.

Make private inlines in C files 'static inline', not just 'inline', or the compiler
can discard the definition if it chooses not to inline it.

Make functions declared in header files not be declared inline (if they're defined in a
.c file).  It looks like no functions in this category are used in LibSRTP's critical
path, only for unit tests or generating AES tables.

To see the problem prior to this commit, compile with "gcc -O0 -std=gnu99".


Index: aes_icm.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/cipher/aes_icm.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** aes_icm.c	20 May 2010 22:09:11 -0000	1.19
--- aes_icm.c	27 Oct 2011 16:06:12 -0000	1.20
***************
*** 293,297 ****
   */
    
! inline void
  aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
    /* fill buffer with new keystream */
--- 293,297 ----
   */
    
! static inline void
  aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
    /* fill buffer with new keystream */
***************
*** 318,322 ****
  }
  
! inline void aes_icm_advance(aes_icm_ctx_t *c) {
    aes_icm_advance_ismacryp(c, 0);
  }
--- 318,322 ----
  }
  
! static inline void aes_icm_advance(aes_icm_ctx_t *c) {
    aes_icm_advance_ismacryp(c, 0);
  }

[Srtp-cvs] srtp config.guess,1.2,1.3 config.sub,1.2,1.3

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp
In directory vz-cvs-3.sog:/tmp/cvs-serv19713

Modified Files:
	config.guess config.sub 
Log Message:
Import the latest versions of config.guess and config.sub from
savannah.gnu.org, to pick up recently-defined host triplets.


Index: config.guess
===================================================================
RCS file: /cvsroot/srtp/srtp/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.guess	2 Oct 2005 19:03:54 -0000	1.2
--- config.guess	2 Aug 2011 15:30:03 -0000	1.3
***************
*** 2,8 ****
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
! timestamp='2004-09-07'
  
  # This file is free software; you can redistribute it and/or modify it
--- 2,9 ----
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
[...2140 lines suppressed...]
      c4*)
  	echo c4-convex-bsd
! 	exit ;;
      esac
  fi
***************
*** 1408,1412 ****
  download the most up to date version of the config scripts from
  
!     ftp://ftp.gnu.org/pub/gnu/config/
  
  If the version you run ($0) is already up to date, please
--- 1476,1482 ----
  download the most up to date version of the config scripts from
  
!   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
! and
!   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  
  If the version you run ($0) is already up to date, please

Index: config.sub
===================================================================
RCS file: /cvsroot/srtp/srtp/config.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.sub	2 Oct 2005 19:03:53 -0000	1.2
--- config.sub	2 Aug 2011 15:30:03 -0000	1.3
***************
*** 2,8 ****
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
! timestamp='2004-08-29'
  
  # This file is (in principle) common to ALL GNU software.
--- 2,9 ----
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
[...970 lines suppressed...]
  				;;
--- 1684,1688 ----
  				vendor=sun
  				;;
! 			-cnk*|-aix*)
  				vendor=ibm
  				;;
***************
*** 1546,1550 ****
  
  echo $basic_machine$os
! exit 0
  
  # Local variables:
--- 1747,1751 ----
  
  echo $basic_machine$os
! exit
  
  # Local variables:

[Srtp-cvs] srtp/include srtp.h,1.22,1.23

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/include
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5327/include

Modified Files:
	srtp.h 
Log Message:
Remove #pragma pack() calls for MSC.

It looks like it was added for the bit-packed structures, but not moved when
srtp_priv.h was split out.  Correct packing of bit-packed structures is now
resolved differently for Microsoft C.

With the previous code, it could result in the structures defined in
crypto_kernel.h and its includes being compiled with inconsistent packing,
depending on the order in which header files are included in C files.


Index: srtp.h
===================================================================
RCS file: /cvsroot/srtp/srtp/include/srtp.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** srtp.h	20 May 2010 20:55:54 -0000	1.22
--- srtp.h	15 Jun 2010 20:56:10 -0000	1.23
***************
*** 51,58 ****
  #endif
  
- #ifdef _MSC_VER
- #pragma pack(4)
- #endif
- 
  #include "crypto_kernel.h" 
  
--- 51,54 ----
***************
*** 1004,1011 ****
  #define SRTCP_INDEX_MASK 0x7fffffff
  
- #ifdef _MSC_VER
- #pragma pack()
- #endif
- 
  #ifdef __cplusplus
  }
--- 1000,1003 ----

[Srtp-cvs] srtp/doc intro.txt,1.4,1.5

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4593

Modified Files:
	intro.txt 
Log Message:
Apply documentation typo fixes submitted by Jaap Keuter.


Index: intro.txt
===================================================================
RCS file: /cvsroot/srtp/srtp/doc/intro.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** intro.txt	30 Sep 2005 17:30:26 -0000	1.4
--- intro.txt	1 Jun 2010 18:26:12 -0000	1.5
***************
*** 6,13 ****
  from Cisco Systems, Inc.  RTP is the Real-time Transport Protocol, an
  IETF standard for the transport of real-time data such as telephony,
! audio, and video, defined by RFC1889.  Secure RTP (SRTP) is an RTP
  profile for providing confidentiality to RTP data and authentication
! to the RTP header and payload.  SRTP is an IETF Proposed Standard, and
! is defined in RFC 3711, and was developed in the IETF Audio/Video
  Transport (AVT) Working Group.  This library supports all of the
  mandatory features of SRTP, but not all of the optional features.  See
--- 6,13 ----
  from Cisco Systems, Inc.  RTP is the Real-time Transport Protocol, an
  IETF standard for the transport of real-time data such as telephony,
! audio, and video, defined by RFC 3550.  Secure RTP (SRTP) is an RTP
  profile for providing confidentiality to RTP data and authentication
! to the RTP header and payload.  SRTP is an IETF Proposed Standard,
! defined in RFC 3711, and was developed in the IETF Audio/Video
  Transport (AVT) Working Group.  This library supports all of the
  mandatory features of SRTP, but not all of the optional features.  See
***************
*** 111,115 ****
  \texttt{tar.gz}, and indicates a compressed tar file.}  You probably
  want to get the most recent release.  Unpack the distribution and
! extract the source files; the directory into which the soruce files
  will go is named \texttt{srtp}.
  
--- 111,115 ----
  \texttt{tar.gz}, and indicates a compressed tar file.}  You probably
  want to get the most recent release.  Unpack the distribution and
! extract the source files; the directory into which the source files
  will go is named \texttt{srtp}.
  
***************
*** 136,140 ****
  \end{quote}
  
! By default, dynamic debbuging is enabled and stdout is used for
  debugging.  You can use the configure options to have the debugging
  output sent to syslog or the system console.  Alternatively, you can
--- 136,140 ----
  \end{quote}
  
! By default, dynamic debugging is enabled and stdout is used for
  debugging.  You can use the configure options to have the debugging
  output sent to syslog or the system console.  Alternatively, you can
***************
*** 182,186 ****
  
  \texttt{rtpw [[-d $<$debug$>$]* [-k $<$key$>$ [-a][-e]] [-s | -r] dest\_ip
! dest\_port][-l]}
  
  Either the -s (sender) or -r (receiver) option must be chosen.  The
--- 182,186 ----
  
  \texttt{rtpw [[-d $<$debug$>$]* [-k $<$key$>$ [-a][-e]] [-s | -r] dest\_ip
! dest\_port] | [-l]}
  
  Either the -s (sender) or -r (receiver) option must be chosen.  The
***************
*** 190,194 ****
  \begin{tabular}{ll}
    -s		& (S)RTP sender - causes app to send words \\
!   -r		& (S)RTP receive - causes app to receve words \\
    -k $<$key$>$      & use SRTP master key $<$key$>$, where the 
  		key is a hexadecimal value (without the
--- 190,194 ----
  \begin{tabular}{ll}
    -s		& (S)RTP sender - causes app to send words \\
!   -r		& (S)RTP receive - causes app to receive words \\
    -k $<$key$>$      & use SRTP master key $<$key$>$, where the 
  		key is a hexadecimal value (without the
***************
*** 198,202 ****
    -a            & message authentication 
                  (requires use of -k option as well) \\
!   -l            & list the avaliable debug modules \\
    -d $<$debug$>$    & turn on debugging for module $<$debug$>$ \\
  \end{tabular}
--- 198,202 ----
    -a            & message authentication 
                  (requires use of -k option as well) \\
!   -l            & list the available debug modules \\
    -d $<$debug$>$    & turn on debugging for module $<$debug$>$ \\
  \end{tabular}
***************
*** 360,364 ****
  
     // allocate and initialize the SRTP session 
!    srtp_create(&session, policy);  
     
     // main loop: get rtp packets, send srtp packets
--- 360,364 ----
  
     // allocate and initialize the SRTP session 
!    srtp_create(&session, &policy);  
     
     // main loop: get rtp packets, send srtp packets

[Srtp-cvs] srtp/srtp srtp.c,1.33,1.34

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/srtp
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2207

Modified Files:
	srtp.c 
Log Message:
Patch from Jaap Keuter:

Call cipher_decrypt() instead of cipher_encrypt() in srtp_unprotect and 
srtp_unprotect_rtcp.  Makes no difference for AES_ICM, but fixes asymmetric
ciphers.


Index: srtp.c
===================================================================
RCS file: /cvsroot/srtp/srtp/srtp/srtp.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** srtp.c	27 May 2010 19:22:25 -0000	1.33
--- srtp.c	1 Jun 2010 18:19:04 -0000	1.34
***************
*** 1159,1165 ****
    }
  
!   /* if we're encrypting, add keystream into ciphertext */
    if (enc_start) {
!     status = cipher_encrypt(stream->rtp_cipher, 
  			    (uint8_t *)enc_start, &enc_octet_len);
      if (status)
--- 1159,1165 ----
    }
  
!   /* if we're decrypting, add keystream into ciphertext */
    if (enc_start) {
!     status = cipher_decrypt(stream->rtp_cipher, 
  			    (uint8_t *)enc_start, &enc_octet_len);
      if (status)
***************
*** 1965,1969 ****
    /* if we're decrypting, exor keystream into the message */
    if (enc_start) {
!     status = cipher_encrypt(stream->rtcp_cipher, 
  			    (uint8_t *)enc_start, &enc_octet_len);
      if (status)
--- 1965,1969 ----
    /* if we're decrypting, exor keystream into the message */
    if (enc_start) {
!     status = cipher_decrypt(stream->rtcp_cipher, 
  			    (uint8_t *)enc_start, &enc_octet_len);
      if (status)

[Srtp-cvs] srtp/test replay_driver.c,1.6,1.7

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/test
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1709

Modified Files:
	replay_driver.c 
Log Message:
Add Per Cederqvist's version of the test to detect the rtcp replay loss crash.


Index: replay_driver.c
===================================================================
RCS file: /cvsroot/srtp/srtp/test/replay_driver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** replay_driver.c	14 May 2010 22:16:43 -0000	1.6
--- replay_driver.c	1 Jun 2010 18:15:39 -0000	1.7
***************
*** 196,199 ****
--- 196,220 ----
    }
  
+   /* re-initialize */
+   if (rdb_init(&rdb) != err_status_ok) {
+     printf("rdb_init failed\n");
+     return err_status_fail;
+   }
+ 
+   /* test loss of first 513 packets */
+   for (idx=0; idx < num_trials; idx++) {
+     err = rdb_check_add(&rdb, idx + 513);
+     if (err) 
+       return err;
+   }
+ 
+   /* test for false positives */
+   for (idx=0; idx < num_trials + 513; idx++) {
+     err = rdb_check_expect_failure(&rdb, idx);
+     if (err) 
+       return err;
+   }
+ 
+ 
    return err_status_ok;
  }

[Srtp-cvs] srtp/test srtp_driver.c,1.24,1.25

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/test
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11302

Modified Files:
	srtp_driver.c 
Log Message:
Test adding and removing a single stream from an srtp session.  (Bug #2192597,
reported by Steve Kiser.)


Index: srtp_driver.c
===================================================================
RCS file: /cvsroot/srtp/srtp/test/srtp_driver.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** srtp_driver.c	21 May 2010 00:30:21 -0000	1.24
--- srtp_driver.c	27 May 2010 19:23:05 -0000	1.25
***************
*** 1445,1449 ****
  srtp_test_remove_stream() { 
    err_status_t status;
!   srtp_policy_t *policy_list;
    srtp_t session;
    srtp_stream_t stream;
--- 1445,1449 ----
  srtp_test_remove_stream() { 
    err_status_t status;
!   srtp_policy_t *policy_list, policy;
    srtp_t session;
    srtp_stream_t stream;
***************
*** 1494,1497 ****
--- 1494,1524 ----
      return status;
  
+   /* Now test adding and removing a single stream */
+   crypto_policy_set_rtp_default(&policy.rtp);
+   crypto_policy_set_rtcp_default(&policy.rtcp);
+   policy.ssrc.type  = ssrc_specific;
+   policy.ssrc.value = 0xcafebabe;
+   policy.key  = test_key;
+   policy.ekt = NULL;
+   policy.window_size = 128;
+   policy.allow_repeat_tx = 0;
+   policy.next = NULL;
+ 
+   status = srtp_create(&session, NULL);
+   if (status != err_status_ok)
+     return status;
+   
+   status = srtp_add_stream(session, &policy);
+   if (status != err_status_ok)
+     return status;
+ 
+   status = srtp_remove_stream(session, htonl(0xcafebabe));
+   if (status != err_status_ok)
+     return status;
+ 
+   status = srtp_dealloc(session);
+   if (status != err_status_ok)
+     return status;
+ 
    return err_status_ok;  
  }

[Srtp-cvs] srtp/srtp srtp.c,1.32,1.33

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/srtp
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10980

Modified Files:
	srtp.c 
Log Message:
Fix memory corruption if the first stream in a session is removed.  (Bug
#2192597, reported by Steve Kiser.)


Index: srtp.c
===================================================================
RCS file: /cvsroot/srtp/srtp/srtp/srtp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** srtp.c	20 May 2010 22:10:20 -0000	1.32
--- srtp.c	27 May 2010 19:22:25 -0000	1.33
***************
*** 1465,1469 ****
  
    /* remove stream from the list */
!   last_stream->next = stream->next;
  
    /* deallocate the stream */
--- 1465,1473 ----
  
    /* remove stream from the list */
!   if (last_stream == stream)
!     /* stream was first in list */
!     session->stream_list = stream->next;
!   else
!     last_stream->next = stream->next;
  
    /* deallocate the stream */

[Srtp-cvs] srtp/crypto/rng rand_source.c,1.9,1.10

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/rng
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18834

Modified Files:
	rand_source.c 
Log Message:
Handle short read() from /dev/urandom.  Bug #1428214 reported by Andris Pavenis.


Index: rand_source.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/rng/rand_source.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rand_source.c	23 May 2007 17:37:56 -0000	1.9
--- rand_source.c	27 May 2010 19:54:11 -0000	1.10
***************
*** 106,111 ****
     */
  #ifdef DEV_URANDOM
!   if (read(dev_random_fdes, dest, len) != len)
!     return err_status_fail;
  #elif defined(HAVE_RAND_S)
    uint8_t *dst = (uint8_t *)dest;
--- 106,118 ----
     */
  #ifdef DEV_URANDOM
!   uint8_t *dst = (uint8_t *)dest;
!   while (len)
!   {
!     ssize_t num_read = read(dev_random_fdes, dst, len);
!     if (num_read <= 0 || num_read > len)
!       return err_status_fail;
!     len -= num_read;
!     dst += num_read;
!   }
  #elif defined(HAVE_RAND_S)
    uint8_t *dst = (uint8_t *)dest;

[Srtp-cvs] srtp Makefile.in,1.21,1.22

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv567

Modified Files:
	Makefile.in 
Log Message:
Clean crypto/Makefile and doc/Makefile on superclean.

Add distclean as a synonym for superclean.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/srtp/srtp/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.in	14 May 2010 23:34:10 -0000	1.21
--- Makefile.in	21 May 2010 17:45:35 -0000	1.22
***************
*** 187,191 ****
  	$(MAKE) -C doc
  
! .PHONY: clean superclean install
  
  install:
--- 187,191 ----
  	$(MAKE) -C doc
  
! .PHONY: clean superclean distclean install
  
  install:
***************
*** 220,226 ****
  superclean: clean
  	rm -rf crypto/include/config.h config.log config.cache config.status \
!                Makefile .gdb_history test/.gdb_history .DS_Store
  	rm -rf autom4te.cache
  
  distname = srtp-$(shell cat VERSION)
  
--- 220,229 ----
  superclean: clean
  	rm -rf crypto/include/config.h config.log config.cache config.status \
!                Makefile crypto/Makefile doc/Makefile \
!                .gdb_history test/.gdb_history .DS_Store
  	rm -rf autom4te.cache
  
+ distclean: superclean
+ 
  distname = srtp-$(shell cat VERSION)
  

[Srtp-cvs] srtp/doc libsrtp.pdf,1.9,1.10

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13973/doc

Modified Files:
	libsrtp.pdf 
Log Message:
Regenerate documentation.


Index: libsrtp.pdf
===================================================================
RCS file: /cvsroot/srtp/srtp/doc/libsrtp.pdf,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
Binary files /tmp/cvseW39zJ and /tmp/cvsmz1brq differ

[Srtp-cvs] srtp/srtp ekt.c,1.7,1.8

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/srtp
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/srtp

Modified Files:
	ekt.c 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: ekt.c
===================================================================
RCS file: /cvsroot/srtp/srtp/srtp/ekt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ekt.c	20 May 2010 00:54:50 -0000	1.7
--- ekt.c	21 May 2010 00:30:21 -0000	1.8
***************
*** 97,101 ****
    spi_location = packet_start + (pkt_octet_len - EKT_SPI_LEN);
    
!   return *((ekt_spi_t *)spi_location);
  }
  
--- 97,101 ----
    spi_location = packet_start + (pkt_octet_len - EKT_SPI_LEN);
    
!   return *((const ekt_spi_t *)spi_location);
  }
  
***************
*** 106,110 ****
    roc_location = packet_start + (pkt_octet_len - EKT_OCTETS_AFTER_ROC);
    
!   return *((uint32_t *)roc_location);
  }
  
--- 106,110 ----
    roc_location = packet_start + (pkt_octet_len - EKT_OCTETS_AFTER_ROC);
    
!   return *((const uint32_t *)roc_location);
  }
  
***************
*** 183,186 ****
--- 183,189 ----
    /* decrypt the Encrypted Master Key field */
    master_key = srtcp_packet_get_emk_location(srtcp_hdr, pkt_octet_len);
+   /* FIX!? This decrypts the master key in-place, and never uses it */
+   /* FIX!? It's also passing to ekt_dec_key (which is an aes_expanded_key_t)
+    * to a function which expects a raw (unexpanded) key */
    aes_decrypt_with_raw_key((void*)master_key, &stream->ekt->data->ekt_dec_key, 16);
  

[Srtp-cvs] srtp/crypto/test sha1_driver.c,1.6,1.7

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/test
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/crypto/test

Modified Files:
	sha1_driver.c 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: sha1_driver.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/test/sha1_driver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sha1_driver.c	17 May 2010 19:42:26 -0000	1.6
--- sha1_driver.c	21 May 2010 00:30:21 -0000	1.7
***************
*** 114,120 ****
  #if VERBOSE
      printf("PASSED: reference value: %s\n", 
! 	   octet_string_hex_string((uint8_t *)test_case->hash, 20));
      printf("PASSED: computed value:  %s\n", 
! 	   octet_string_hex_string((uint8_t *)hash_value, 20));   
  #endif 
      return err_status_ok;
--- 114,120 ----
  #if VERBOSE
      printf("PASSED: reference value: %s\n", 
! 	   octet_string_hex_string((const uint8_t *)test_case->hash, 20));
      printf("PASSED: computed value:  %s\n", 
! 	   octet_string_hex_string((const uint8_t *)hash_value, 20));   
  #endif 
      return err_status_ok;
***************
*** 122,128 ****
  
    printf("reference value: %s\n", 
! 	 octet_string_hex_string((uint8_t *)test_case->hash, 20));
    printf("computed value:  %s\n", 
! 	 octet_string_hex_string((uint8_t *)hash_value, 20));
  
    return err_status_algo_fail;
--- 122,128 ----
  
    printf("reference value: %s\n", 
! 	 octet_string_hex_string((const uint8_t *)test_case->hash, 20));
    printf("computed value:  %s\n", 
! 	 octet_string_hex_string((const uint8_t *)hash_value, 20));
  
    return err_status_algo_fail;

[Srtp-cvs] srtp/crypto/math datatypes.c,1.10,1.11

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/math
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/crypto/math

Modified Files:
	datatypes.c 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: datatypes.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/math/datatypes.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** datatypes.c	17 May 2010 20:47:42 -0000	1.10
--- datatypes.c	21 May 2010 00:30:21 -0000	1.11
***************
*** 208,221 ****
  char *
  v128_bit_string(v128_t *x) {
!   int j, index;
    uint32_t mask;
    
!   for (j=index=0; j < 4; j++) {
      for (mask=0x80000000; mask > 0; mask >>= 1) {
        if (x->v32[j] & mask)
! 	bit_string[index] = '1';
        else
! 	bit_string[index] = '0';
!       ++index;
      }
    }
--- 208,221 ----
  char *
  v128_bit_string(v128_t *x) {
!   int j, i;
    uint32_t mask;
    
!   for (j=i=0; j < 4; j++) {
      for (mask=0x80000000; mask > 0; mask >>= 1) {
        if (x->v32[j] & mask)
! 	bit_string[i] = '1';
        else
! 	bit_string[i] = '0';
!       ++i;
      }
    }
***************
*** 324,334 ****
  
  void
! v128_right_shift(v128_t *x, int index) {
!   const int base_index = index >> 5;
!   const int bit_index = index & 31;
    int i, from;
    uint32_t b;
      
!   if (index > 127) {
      v128_set_to_zero(x);
      return;
--- 324,334 ----
  
  void
! v128_right_shift(v128_t *x, int shift) {
!   const int base_index = shift >> 5;
!   const int bit_index = shift & 31;
    int i, from;
    uint32_t b;
      
!   if (shift > 127) {
      v128_set_to_zero(x);
      return;
***************
*** 362,371 ****
  
  void
! v128_left_shift(v128_t *x, int index) {
    int i;
!   const int base_index = index >> 5;
!   const int bit_index = index & 31;
  
!   if (index > 127) {
      v128_set_to_zero(x);
      return;
--- 362,371 ----
  
  void
! v128_left_shift(v128_t *x, int shift) {
    int i;
!   const int base_index = shift >> 5;
!   const int bit_index = shift & 31;
  
!   if (shift > 127) {
      v128_set_to_zero(x);
      return;
***************
*** 459,477 ****
  char *
  bitvector_bit_string(bitvector_t *x, char* buf, int len) {
!   int j, index;
    uint32_t mask;
    
!   for (j=index=0; j < (int)(x->length>>5) && index < len-1; j++) {
      for (mask=0x80000000; mask > 0; mask >>= 1) {
        if (x->word[j] & mask)
! 	buf[index] = '1';
        else
! 	buf[index] = '0';
!       ++index;
!       if (index >= len-1)
          break;
      }
    }
!   buf[index] = 0; /* null terminate string */
  
    return buf;
--- 459,477 ----
  char *
  bitvector_bit_string(bitvector_t *x, char* buf, int len) {
!   int j, i;
    uint32_t mask;
    
!   for (j=i=0; j < (int)(x->length>>5) && i < len-1; j++) {
      for (mask=0x80000000; mask > 0; mask >>= 1) {
        if (x->word[j] & mask)
! 	buf[i] = '1';
        else
! 	buf[i] = '0';
!       ++i;
!       if (i >= len-1)
          break;
      }
    }
!   buf[i] = 0; /* null terminate string */
  
    return buf;
***************
*** 479,489 ****
  
  void
! bitvector_left_shift(bitvector_t *x, int index) {
    int i;
!   const int base_index = index >> 5;
!   const int bit_index = index & 31;
    const int word_length = x->length >> 5;
  
!   if (index >= (int)x->length) {
      bitvector_set_to_zero(x);
      return;
--- 479,489 ----
  
  void
! bitvector_left_shift(bitvector_t *x, int shift) {
    int i;
!   const int base_index = shift >> 5;
!   const int bit_index = shift & 31;
    const int word_length = x->length >> 5;
  
!   if (shift >= (int)x->length) {
      bitvector_set_to_zero(x);
      return;

[Srtp-cvs] srtp/test rtp.c,1.10,1.11 srtp_driver.c,1.23,1.24

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/test
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/test

Modified Files:
	rtp.c srtp_driver.c 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: rtp.c
===================================================================
RCS file: /cvsroot/srtp/srtp/test/rtp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rtp.c	17 May 2010 19:42:26 -0000	1.10
--- rtp.c	21 May 2010 00:30:21 -0000	1.11
***************
*** 106,110 ****
  int
  rtp_sender_init(rtp_sender_t sender, 
! 		int socket, 
  		struct sockaddr_in addr,
  		unsigned int ssrc) {
--- 106,110 ----
  int
  rtp_sender_init(rtp_sender_t sender, 
! 		int sock, 
  		struct sockaddr_in addr,
  		unsigned int ssrc) {
***************
*** 122,126 ****
  
    /* set other stuff */
!   sender->socket = socket;
    sender->addr = addr;
  
--- 122,126 ----
  
    /* set other stuff */
!   sender->socket = sock;
    sender->addr = addr;
  
***************
*** 130,134 ****
  int
  rtp_receiver_init(rtp_receiver_t rcvr, 
! 		  int socket, 
  		  struct sockaddr_in addr,
  		  unsigned int ssrc) {
--- 130,134 ----
  int
  rtp_receiver_init(rtp_receiver_t rcvr, 
! 		  int sock, 
  		  struct sockaddr_in addr,
  		  unsigned int ssrc) {
***************
*** 146,150 ****
  
    /* set other stuff */
!   rcvr->socket = socket;
    rcvr->addr = addr;
  
--- 146,150 ----
  
    /* set other stuff */
!   rcvr->socket = sock;
    rcvr->addr = addr;
  

Index: srtp_driver.c
===================================================================
RCS file: /cvsroot/srtp/srtp/test/srtp_driver.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** srtp_driver.c	20 May 2010 20:55:54 -0000	1.23
--- srtp_driver.c	21 May 2010 00:30:21 -0000	1.24
***************
*** 526,530 ****
    timer = clock();
    for (i=0; i < num_trials; i++) {
-     err_status_t status;
      len = msg_len_octets + 12;  /* add in rtp header length */
      
--- 526,529 ----
***************
*** 537,542 ****
  
      /* increment message number */
!     mesg->seq = htons(ntohs(mesg->seq) + 1);
! 
    }
    timer = clock() - timer;
--- 536,544 ----
  
      /* increment message number */
!     {
!       /* hack sequence to avoid problems with macros for htons/ntohs on some systems */
!       short new_seq = ntohs(mesg->seq) + 1;
!       mesg->seq = htons(new_seq);
!     }
    }
    timer = clock() - timer;
***************
*** 1197,1206 ****
  err_status_t
  srtp_validate() {
-   unsigned char test_key[30] = {
-     0xe1, 0xf9, 0x7a, 0x0d, 0x3e, 0x01, 0x8b, 0xe0,
-     0xd6, 0x4f, 0xa3, 0x2c, 0x06, 0xde, 0x41, 0x39,
-     0x0e, 0xc6, 0x75, 0xad, 0x49, 0x8a, 0xfe, 0xeb,
-     0xb6, 0x96, 0x0b, 0x3a, 0xab, 0xe6
-   };
    uint8_t srtp_plaintext_ref[28] = {
      0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, 
--- 1199,1202 ----
***************
*** 1302,1306 ****
  err_status_t
  srtp_validate_aes_256() {
!   unsigned char test_key[46] = {
      0xf0, 0xf0, 0x49, 0x14, 0xb5, 0x13, 0xf2, 0x76,
      0x3a, 0x1b, 0x1f, 0xa1, 0x30, 0xf1, 0x0e, 0x29,
--- 1298,1302 ----
  err_status_t
  srtp_validate_aes_256() {
!   unsigned char aes_256_test_key[46] = {
      0xf0, 0xf0, 0x49, 0x14, 0xb5, 0x13, 0xf2, 0x76,
      0x3a, 0x1b, 0x1f, 0xa1, 0x30, 0xf1, 0x0e, 0x29,
***************
*** 1344,1348 ****
    policy.ssrc.type  = ssrc_specific;
    policy.ssrc.value = 0xcafebabe;
!   policy.key  = test_key;
    policy.ekt = NULL;
    policy.window_size = 128;
--- 1340,1344 ----
    policy.ssrc.type  = ssrc_specific;
    policy.ssrc.value = 0xcafebabe;
!   policy.key  = aes_256_test_key;
    policy.ekt = NULL;
    policy.window_size = 128;

[Srtp-cvs] srtp/crypto/replay rdb.c,1.5,1.6

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/replay
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/crypto/replay

Modified Files:
	rdb.c 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: rdb.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/replay/rdb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rdb.c	14 May 2010 22:15:12 -0000	1.5
--- rdb.c	21 May 2010 00:30:21 -0000	1.6
***************
*** 71,86 ****
  
  err_status_t
! rdb_check(const rdb_t *rdb, uint32_t index) {
    
    /* if the index appears after (or at very end of) the window, its good */
!   if (index >= rdb->window_start + rdb_bits_in_bitmask)
      return err_status_ok;
    
    /* if the index appears before the window, its bad */
!   if (index < rdb->window_start)
      return err_status_replay_old;
  
    /* otherwise, the index appears within the window, so check the bitmask */
!   if (v128_get_bit(&rdb->bitmask, (index - rdb->window_start)) == 1)
      return err_status_replay_fail;    
        
--- 71,86 ----
  
  err_status_t
! rdb_check(const rdb_t *rdb, uint32_t p_index) {
    
    /* if the index appears after (or at very end of) the window, its good */
!   if (p_index >= rdb->window_start + rdb_bits_in_bitmask)
      return err_status_ok;
    
    /* if the index appears before the window, its bad */
!   if (p_index < rdb->window_start)
      return err_status_replay_old;
  
    /* otherwise, the index appears within the window, so check the bitmask */
!   if (v128_get_bit(&rdb->bitmask, (p_index - rdb->window_start)) == 1)
      return err_status_replay_fail;    
        
***************
*** 99,111 ****
  
  err_status_t
! rdb_add_index(rdb_t *rdb, uint32_t index) {
    int delta;  
  
!   /* here we *assume* that index > rdb->window_start */
  
!   delta = (index - rdb->window_start);    
    if (delta < rdb_bits_in_bitmask) {
  
!     /* if the index is within the window, set the appropriate bit */
      v128_set_bit(&rdb->bitmask, delta);
  
--- 99,111 ----
  
  err_status_t
! rdb_add_index(rdb_t *rdb, uint32_t p_index) {
    int delta;  
  
!   /* here we *assume* that p_index > rdb->window_start */
  
!   delta = (p_index - rdb->window_start);    
    if (delta < rdb_bits_in_bitmask) {
  
!     /* if the p_index is within the window, set the appropriate bit */
      v128_set_bit(&rdb->bitmask, delta);
  

[Srtp-cvs] srtp/crypto/include datatypes.h, 1.16, 1.17 null_cipher.h, 1.4, 1.5 rdb.h, 1.1, 1.2

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/include
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/crypto/include

Modified Files:
	datatypes.h null_cipher.h rdb.h 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: rdb.h
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/include/rdb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rdb.h	26 Sep 2005 20:41:14 -0000	1.1
--- rdb.h	21 May 2010 00:30:21 -0000	1.2
***************
*** 50,54 ****
  
  err_status_t
! rdb_check(const rdb_t *rdb, uint32_t index);  
  
  /*
--- 50,54 ----
  
  err_status_t
! rdb_check(const rdb_t *rdb, uint32_t rdb_index);  
  
  /*
***************
*** 62,66 ****
  
  err_status_t
! rdb_add_index(rdb_t *rdb, uint32_t index);
  
  /*
--- 62,66 ----
  
  err_status_t
! rdb_add_index(rdb_t *rdb, uint32_t rdb_index);
  
  /*

Index: null_cipher.h
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/include/null_cipher.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** null_cipher.h	18 May 2010 18:42:55 -0000	1.4
--- null_cipher.h	21 May 2010 00:30:21 -0000	1.5
***************
*** 67,71 ****
  err_status_t
  null_cipher_set_segment(null_cipher_ctx_t *c,
! 			unsigned long index);
  
  err_status_t
--- 67,71 ----
  err_status_t
  null_cipher_set_segment(null_cipher_ctx_t *c,
! 			unsigned long segment_index);
  
  err_status_t

Index: datatypes.h
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/include/datatypes.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** datatypes.h	17 May 2010 20:47:42 -0000	1.16
--- datatypes.h	21 May 2010 00:30:21 -0000	1.17
***************
*** 156,163 ****
  
  void
! v128_left_shift(v128_t *x, int index);
  
  void
! v128_right_shift(v128_t *x, int index);
  
  /*
--- 156,163 ----
  
  void
! v128_left_shift(v128_t *x, int shift_index);
  
  void
! v128_right_shift(v128_t *x, int shift_index);
  
  /*

[Srtp-cvs] srtp/include rtp.h,1.9,1.10

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/include
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8818/include

Modified Files:
	rtp.h 
Log Message:
Fix warnings exposed by gcc -Wcast-qual and -Wshadow.
(Patch from Randell Jesup 07/10/2009, cleaned up for current tip-of-tree.)


Index: rtp.h
===================================================================
RCS file: /cvsroot/srtp/srtp/include/rtp.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rtp.h	17 May 2010 19:42:26 -0000	1.9
--- rtp.h	21 May 2010 00:30:21 -0000	1.10
***************
*** 74,82 ****
  
  int
! rtp_receiver_init(rtp_receiver_t rcvr, int socket, 
  		  struct sockaddr_in addr, unsigned int ssrc);
  
  int
! rtp_sender_init(rtp_sender_t sender, int socket, 
  		struct sockaddr_in addr, unsigned int ssrc);
  
--- 74,82 ----
  
  int
! rtp_receiver_init(rtp_receiver_t rcvr, int sock, 
  		  struct sockaddr_in addr, unsigned int ssrc);
  
  int
! rtp_sender_init(rtp_sender_t sender, int sock, 
  		struct sockaddr_in addr, unsigned int ssrc);
  

[Srtp-cvs] srtp/crypto/kernel crypto_kernel.c,1.9,1.10

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/kernel
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30240/kernel

Modified Files:
	crypto_kernel.c 
Log Message:
Add crypto_kernel_replace_cipher_type and crypto_kernel_replace_auth_type
functions, allowing users to plug-in their own implementations of ciphers
and auth types.


Index: crypto_kernel.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/kernel/crypto_kernel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** crypto_kernel.c	20 May 2010 22:09:12 -0000	1.9
--- crypto_kernel.c	20 May 2010 23:53:15 -0000	1.10
***************
*** 298,303 ****
  }
  
! err_status_t
! crypto_kernel_load_cipher_type(cipher_type_t *new_ct, cipher_type_id_t id) {
    kernel_cipher_type_t *ctype, *new_ctype;
    err_status_t status;
--- 298,304 ----
  }
  
! inline err_status_t
! crypto_kernel_do_load_cipher_type(cipher_type_t *new_ct, cipher_type_id_t id,
! 				  int replace) {
    kernel_cipher_type_t *ctype, *new_ctype;
    err_status_t status;
***************
*** 319,340 ****
    ctype = crypto_kernel.cipher_type_list;
    while (ctype != NULL) {
!     if ((new_ct == ctype->cipher_type) || (id == ctype->id))
        return err_status_bad_param;    
      ctype = ctype->next;
    }
  
!   /* put new_ct at the head of the list */
    /* allocate memory */
!   new_ctype = (kernel_cipher_type_t *) crypto_alloc(sizeof(kernel_cipher_type_t));
!   if (new_ctype == NULL)
!     return err_status_alloc_fail;
      
    /* set fields */
    new_ctype->cipher_type = new_ct;
    new_ctype->id = id;
-   new_ctype->next = crypto_kernel.cipher_type_list;
- 
-   /* set head of list to new cipher type */
-   crypto_kernel.cipher_type_list = new_ctype;    
  
    /* load debug module, if there is one present */
--- 320,352 ----
    ctype = crypto_kernel.cipher_type_list;
    while (ctype != NULL) {
!     if (id == ctype->id) {
!       if (!replace)
! 	return err_status_bad_param;
!       status = cipher_type_test(new_ct, ctype->cipher_type->test_data);
!       if (status)
! 	return status;
!       new_ctype = ctype;
!       break;
!     }
!     else if (new_ct == ctype->cipher_type)
        return err_status_bad_param;    
      ctype = ctype->next;
    }
  
!   /* if not found, put new_ct at the head of the list */
!   if (ctype == NULL) {
    /* allocate memory */
!     new_ctype = (kernel_cipher_type_t *) crypto_alloc(sizeof(kernel_cipher_type_t));
!     if (new_ctype == NULL)
!       return err_status_alloc_fail;
!     new_ctype->next = crypto_kernel.cipher_type_list;
! 
!     /* set head of list to new cipher type */
!     crypto_kernel.cipher_type_list = new_ctype;    
!   }
      
    /* set fields */
    new_ctype->cipher_type = new_ct;
    new_ctype->id = id;
  
    /* load debug module, if there is one present */
***************
*** 347,351 ****
  
  err_status_t
! crypto_kernel_load_auth_type(auth_type_t *new_at, auth_type_id_t id) {
    kernel_auth_type_t *atype, *new_atype;
    err_status_t status;
--- 359,374 ----
  
  err_status_t
! crypto_kernel_load_cipher_type(cipher_type_t *new_ct, cipher_type_id_t id) {
!   return crypto_kernel_do_load_cipher_type(new_ct, id, 0);
! }
! 
! err_status_t
! crypto_kernel_replace_cipher_type(cipher_type_t *new_ct, cipher_type_id_t id) {
!   return crypto_kernel_do_load_cipher_type(new_ct, id, 1);
! }
! 
! err_status_t
! crypto_kernel_do_load_auth_type(auth_type_t *new_at, auth_type_id_t id,
! 				int replace) {
    kernel_auth_type_t *atype, *new_atype;
    err_status_t status;
***************
*** 367,388 ****
    atype = crypto_kernel.auth_type_list;
    while (atype != NULL) {
!     if ((new_at == atype->auth_type) || (id == atype->id))
        return err_status_bad_param;    
      atype = atype->next;
    }
  
!   /* put new_at at the head of the list */
!   /* allocate memory */
!   new_atype = (kernel_auth_type_t *)crypto_alloc(sizeof(kernel_auth_type_t));
!   if (new_atype == NULL)
!     return err_status_alloc_fail;
      
    /* set fields */
    new_atype->auth_type = new_at;
    new_atype->id = id;
-   new_atype->next = crypto_kernel.auth_type_list;
- 
-   /* set head of list to new auth type */
-   crypto_kernel.auth_type_list = new_atype;    
  
    /* load debug module, if there is one present */
--- 390,422 ----
    atype = crypto_kernel.auth_type_list;
    while (atype != NULL) {
!     if (id == atype->id) {
!       if (!replace)
! 	return err_status_bad_param;
!       status = auth_type_test(new_at, atype->auth_type->test_data);
!       if (status)
! 	return status;
!       new_atype = atype;
!       break;
!     }
!     else if (new_at == atype->auth_type)
        return err_status_bad_param;    
      atype = atype->next;
    }
  
!   /* if not found, put new_at at the head of the list */
!   if (atype == NULL) {
!     /* allocate memory */
!     new_atype = (kernel_auth_type_t *)crypto_alloc(sizeof(kernel_auth_type_t));
!     if (new_atype == NULL)
!       return err_status_alloc_fail;
! 
!     new_atype->next = crypto_kernel.auth_type_list;
!     /* set head of list to new auth type */
!     crypto_kernel.auth_type_list = new_atype;
!   }
      
    /* set fields */
    new_atype->auth_type = new_at;
    new_atype->id = id;
  
    /* load debug module, if there is one present */
***************
*** 395,398 ****
--- 429,442 ----
  }
  
+ err_status_t
+ crypto_kernel_load_auth_type(auth_type_t *new_at, auth_type_id_t id) {
+   return crypto_kernel_do_load_auth_type(new_at, id, 0);
+ }
+ 
+ err_status_t
+ crypto_kernel_replace_auth_type(auth_type_t *new_at, auth_type_id_t id) {
+   return crypto_kernel_do_load_auth_type(new_at, id, 1);
+ }
+ 
  
  cipher_type_t *

[Srtp-cvs] srtp/crypto/include crypto_kernel.h,1.4,1.5

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/include
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30240/include

Modified Files:
	crypto_kernel.h 
Log Message:
Add crypto_kernel_replace_cipher_type and crypto_kernel_replace_auth_type
functions, allowing users to plug-in their own implementations of ciphers
and auth types.


Index: crypto_kernel.h
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/include/crypto_kernel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** crypto_kernel.h	12 Jul 2006 00:50:56 -0000	1.4
--- crypto_kernel.h	20 May 2010 23:53:15 -0000	1.5
***************
*** 183,186 ****
--- 183,208 ----
  crypto_kernel_load_auth_type(auth_type_t *ct, auth_type_id_t id);
  
+ /*
+  * crypto_kernel_replace_cipher_type(ct, id)
+  * 
+  * replaces the crypto kernel's existing cipher for the cipher_type id
+  * with a new one passed in externally.  The new cipher must pass all the
+  * existing cipher_type's self tests as well as its own.
+  */
+ err_status_t
+ crypto_kernel_replace_cipher_type(cipher_type_t *ct, cipher_type_id_t id);
+ 
+ 
+ /*
+  * crypto_kernel_replace_auth_type(ct, id)
+  * 
+  * replaces the crypto kernel's existing cipher for the auth_type id
+  * with a new one passed in externally.  The new auth type must pass all the
+  * existing auth_type's self tests as well as its own.
+  */
+ err_status_t
+ crypto_kernel_replace_auth_type(auth_type_t *ct, auth_type_id_t id);
+ 
+ 
  err_status_t
  crypto_kernel_load_debug_module(debug_module_t *new_dm);

[Srtp-cvs] srtp/crypto/cipher cipher.c,1.8,1.9

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/cipher
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6520/cipher

Modified Files:
	cipher.c 
Log Message:
Add cipher_type_test, like cipher_type_self_test but with an external set of test cases.


Index: cipher.c
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/cipher/cipher.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cipher.c	15 May 2010 04:58:04 -0000	1.8
--- cipher.c	20 May 2010 22:36:19 -0000	1.9
***************
*** 72,77 ****
  
  /* 
!  * cipher_type_self_test(ct) tests a cipher of type ct against test cases
!  * provided in an array of values of key, salt, xtd_seq_num_t,
   * plaintext, and ciphertext that is known to be good
   */
--- 72,77 ----
  
  /* 
!  * cipher_type_test(ct, test_data) tests a cipher of type ct against
!  * test cases provided in a list test_data of values of key, salt, iv,
   * plaintext, and ciphertext that is known to be good
   */
***************
*** 82,87 ****
  
  err_status_t
! cipher_type_self_test(const cipher_type_t *ct) {
!   const cipher_test_case_t *test_case = ct->test_data;
    cipher_t *c;
    err_status_t status;
--- 82,87 ----
  
  err_status_t
! cipher_type_test(const cipher_type_t *ct, const cipher_test_case_t *test_data) {
!   const cipher_test_case_t *test_case = test_data;
    cipher_t *c;
    err_status_t status;
***************
*** 261,265 ****
  
    /* allocate cipher, using paramaters from the first test case */
!   test_case = ct->test_data;
    status = cipher_type_alloc(ct, &c, test_case->key_length_octets);
    if (status)
--- 261,265 ----
  
    /* allocate cipher, using paramaters from the first test case */
!   test_case = test_data;
    status = cipher_type_alloc(ct, &c, test_case->key_length_octets);
    if (status)
***************
*** 369,372 ****
--- 369,382 ----
  
  
+ /* 
+  * cipher_type_self_test(ct) performs cipher_type_test on ct's internal
+  * list of test data.
+  */
+ 
+ err_status_t
+ cipher_type_self_test(const cipher_type_t *ct) {
+   return cipher_type_test(ct, ct->test_data);
+ }
+ 
  /*
   * cipher_bits_per_second(c, l, t) computes (an estimate of) the

[Srtp-cvs] srtp/crypto/include cipher.h,1.9,1.10

[Jonathan L. <jon...@us...>]

Update of /cvsroot/srtp/srtp/crypto/include
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6520/include

Modified Files:
	cipher.h 
Log Message:
Add cipher_type_test, like cipher_type_self_test but with an external set of test cases.


Index: cipher.h
===================================================================
RCS file: /cvsroot/srtp/srtp/crypto/include/cipher.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cipher.h	20 May 2010 22:09:12 -0000	1.9
--- cipher.h	20 May 2010 22:36:19 -0000	1.10
***************
*** 204,207 ****
--- 204,217 ----
  
  
+ /* 
+  * cipher_type_test() tests a cipher against external test cases provided in 
+  * an array of values of key/xtd_seq_num_t/plaintext/ciphertext 
+  * that is known to be good
+  */
+ 
+ err_status_t
+ cipher_type_test(const cipher_type_t *ct, const cipher_test_case_t *test_data);
+ 
+ 
  /*
   * cipher_bits_per_second(c, l, t) computes (and estimate of) the