| Index: srtp/crypto/include/prng.h
|
| diff --git a/srtp/crypto/include/prng.h b/srtp/crypto/include/prng.h
|
| index ad0a49c228c7dbb4ed1d054d2df0caacedaa92ea..c493383cbaa67bf23f4dea705541a1f4d6c5f66e 100644
|
| --- a/srtp/crypto/include/prng.h
|
| +++ b/srtp/crypto/include/prng.h
|
| @@ -6,48 +6,18 @@
|
| * David A. McGrew
|
| * Cisco Systems, Inc.
|
| */
|
| -/*
|
| - *
|
| - * Copyright (c) 2001-2006, Cisco Systems, Inc.
|
| - * All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - *
|
| - * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - *
|
| - * Redistributions in binary form must reproduce the above
|
| - * copyright notice, this list of conditions and the following
|
| - * disclaimer in the documentation and/or other materials provided
|
| - * with the distribution.
|
| - *
|
| - * Neither the name of the Cisco Systems, Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
| - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
| - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
| - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (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.
|
| - *
|
| - */
|
|
|
| #ifndef PRNG_H
|
| #define PRNG_H
|
|
|
| #include "rand_source.h" /* for rand_source_func_t definition */
|
| #include "aes.h" /* for aes */
|
| +//FIXME: this is temporary until we pull in the code to use OpenSSL for RNG
|
| +#ifdef OPENSSL
|
| +#include "aes_icm_ossl.h" /* for aes ctr */
|
| +#else
|
| #include "aes_icm.h" /* for aes ctr */
|
| +#endif
|
|
|
| #define MAX_PRNG_OUT_LEN 0xffffffffU
|
|
|
|
|