Update libsrtp to upstream 1.5.0

srtp/crypto/rng/ctr_prng.c

 /*
  * ctr_prng.c 
  *
  * counter mode based pseudorandom source
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 25 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "prng.h"
 
 /* single, global prng structure */
 
 ctr_prng_t ctr_prng;
 
 err_status_t
 ctr_prng_init(rand_source_func_t random_source) {
   uint8_t tmp_key[32];
   err_status_t status;
 
   /* initialize output count to zero */
   ctr_prng.octet_count = 0;
 
   /* set random source */
   ctr_prng.rand = random_source;
   
   /* initialize secret key from random source */
   status = random_source(tmp_key, 32);
   if (status) 
     return status;
 
   /* initialize aes ctr context with random key */
+#ifdef OPENSSL
+  status = aes_icm_openssl_context_init(&ctr_prng.state, tmp_key, 30);
+#else
   status = aes_icm_context_init(&ctr_prng.state, tmp_key, 30);
+#endif
   if (status) 
     return status;
 
   return err_status_ok;
 }
 
 err_status_t
 ctr_prng_get_octet_string(void *dest, uint32_t len) {
   err_status_t status;
 
   /* 
    * if we need to re-initialize the prng, do so now 
-   *
-   * avoid 32-bit overflows by subtracting instead of adding
    */
-  if (ctr_prng.octet_count > MAX_PRNG_OUT_LEN - len) {
+  if ((aes_icm_bytes_encrypted(&ctr_prng.state) + len) > 0xffff) {
     status = ctr_prng_init(ctr_prng.rand);    
     if (status)
       return status;
   }
   ctr_prng.octet_count += len;
 
   /*
    * write prng output 
    */
   status = aes_icm_output(&ctr_prng.state, (uint8_t*)dest, len);
   if (status)
     return status;
   
   return err_status_ok;
 }
 
 err_status_t
 ctr_prng_deinit(void) {
 
   /* nothing */
   
   return err_status_ok;  
 }