Commit fc422737 authored by Youness Alaoui's avatar Youness Alaoui

Remove openssl dependency by adding a random number generator implementation into libstun

parent cf238352
...@@ -65,7 +65,6 @@ AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"], [LIBRT=""]) ...@@ -65,7 +65,6 @@ AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"], [LIBRT=""])
AC_CHECK_FUNCS([poll]) AC_CHECK_FUNCS([poll])
AC_SUBST(LIBRT) AC_SUBST(LIBRT)
PKG_CHECK_MODULES(OPENSSL, [openssl])
PKG_CHECK_MODULES(GLIB, [dnl PKG_CHECK_MODULES(GLIB, [dnl
glib-2.0 >= 2.10 dnl glib-2.0 >= 2.10 dnl
......
...@@ -212,7 +212,5 @@ format, STUN messages are stored in wire format within the buffers. ...@@ -212,7 +212,5 @@ format, STUN messages are stored in wire format within the buffers.
There is no intermediary translation, so the APIs can operate directly There is no intermediary translation, so the APIs can operate directly
with data received from or sent to the network. with data received from or sent to the network.
[1] With two exceptions: creating a new message might require locking [1] With one exception: The random number generated might access the
to ensure uniqueness; and OpenSSL which is used for cryptographic system entropy pool (/dev/urandom) if available.
hashing and random number generation might access the system entropy
pool, use threading synchronization...
...@@ -10,7 +10,7 @@ SUBDIRS = . tools tests ...@@ -10,7 +10,7 @@ SUBDIRS = . tools tests
include $(top_srcdir)/common.mk include $(top_srcdir)/common.mk
AM_CFLAGS = -std=gnu99 $(ERROR_CFLAGS) $(OPENSSL_CFLAGS) AM_CFLAGS = -std=gnu99 $(ERROR_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir) AM_CPPFLAGS = -I$(top_srcdir)
noinst_LTLIBRARIES = libstun.la noinst_LTLIBRARIES = libstun.la
...@@ -22,6 +22,7 @@ libstun_la_SOURCES = constants.h \ ...@@ -22,6 +22,7 @@ libstun_la_SOURCES = constants.h \
stuncrc32.c stuncrc32.h \ stuncrc32.c stuncrc32.h \
sha1.c sha1.h \ sha1.c sha1.h \
md5.c md5.h \ md5.c md5.h \
rand.c rand.h \
stunhmac.c stunhmac.h \ stunhmac.c stunhmac.h \
utils.c utils.h \ utils.c utils.h \
usages/ice.c usages/ice.h \ usages/ice.c usages/ice.h \
...@@ -30,6 +31,6 @@ libstun_la_SOURCES = constants.h \ ...@@ -30,6 +31,6 @@ libstun_la_SOURCES = constants.h \
usages/timer.c usages/timer.h \ usages/timer.c usages/timer.h \
usages/trans.c usages/trans.h usages/trans.c usages/trans.h
libstun_la_LIBADD = $(OPENSSL_LIBS) $(LIBRT) libstun_la_LIBADD = $(LIBRT)
EXTRA_DIST = win32_common.h EXTRA_DIST = win32_common.h
/*
* This file is part of the Nice GLib ICE library.
*
* (C) 2008 Nokia Corporation. All rights reserved.
* (C) 2008 Collabora Ltd. All rights reserved.
* Contact: Youness Alaoui
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Nice GLib ICE library.
*
* The Initial Developers of the Original Code are Collabora Ltd and Nokia
* Corporation. All Rights Reserved.
*
* Alternatively, the contents of this file may be used under the terms of the
* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
* case the provisions of LGPL are applicable instead of those above. If you
* wish to allow use of your version of this file only under the terms of the
* LGPL and not to allow others to use your version of this file under the
* MPL, indicate your decision by deleting the provisions above and replace
* them with the notice and other provisions required by the LGPL. If you do
* not delete the provisions above, a recipient may use your version of this
* file under either the MPL or the LGPL.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "rand.h"
#ifdef _WIN32
#include <Wincrypt.h>
void RAND_bytes (uint8_t *dst, int len)
{
HCRYPTPROV hCryptProv = NULL;
LPCSTR container = "Libnice key container";
if(!CryptAcquireContext(&hCryptProv, container, NULL, PROV_RSA_FULL, 0)) {
/* non existing container. try to create a new one */
if (GetLastError() == NTE_BAD_KEYSET) {
if(!CryptAcquireContext(&hCryptProv, container, NULL, CRYPT_NEWKEYSET)) {
return;
}
}
return;
}
CryptGenRandom (&hCryptProv, len, dst);
}
#else
/* ------------- Start original implementation. ----------------- */
/* http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html */
/*
A C-program for MT19937, with initialization improved 2002/1/26.
Coded by Takuji Nishimura and Makoto Matsumoto.
Before using, initialize the state by using init_genrand(seed)
or init_by_array(init_key, key_length).
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
All rights reserved
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. 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.
3. The names of its contributors may not 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 OWNER 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.
Any feedback is very welcome.
http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
*/
/* Period parameters */
#define N 624
#define M 397
#define MATRIX_A 0x9908b0dfUL /* constant vector a */
#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
static unsigned long mt[N]; /* the array for the state vector */
static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
/* initializes mt[N] with a seed */
static void init_genrand(unsigned long s)
{
mt[0]= s & 0xffffffffUL;
for (mti=1; mti<N; mti++) {
mt[mti] = (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
/* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
/* In the previous versions, MSBs of the seed affect */
/* only MSBs of the array mt[]. */
/* 2002/01/09 modified by Makoto Matsumoto */
mt[mti] &= 0xffffffffUL;
/* for >32 bit machines */
}
}
/* initialize by an array with array-length */
/* init_key is the array for initializing keys */
/* key_length is its length */
/* slight change for C++, 2004/2/26 */
static void init_by_array(unsigned long init_key[], int key_length)
{
int i, j, k;
init_genrand(19650218UL);
i=1; j=0;
k = (N>key_length ? N : key_length);
for (; k; k--) {
mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL))
+ init_key[j] + j; /* non linear */
mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
i++; j++;
if (i>=N) { mt[0] = mt[N-1]; i=1; }
if (j>=key_length) j=0;
}
for (k=N-1; k; k--) {
mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL))
- i; /* non linear */
mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
i++;
if (i>=N) { mt[0] = mt[N-1]; i=1; }
}
mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */
}
/* generates a random number on [0,0xffffffff]-interval */
static unsigned long genrand_int32(void)
{
unsigned long y;
static unsigned long mag01[2]={0x0UL, MATRIX_A};
/* mag01[x] = x * MATRIX_A for x=0,1 */
if (mti >= N) { /* generate N words at one time */
int kk;
if (mti == N+1) /* if init_genrand() has not been called, */
init_genrand(5489UL); /* a default initial seed is used */
for (kk=0;kk<N-M;kk++) {
y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
}
for (;kk<N-1;kk++) {
y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
}
y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
mti = 0;
}
y = mt[mti++];
/* Tempering */
y ^= (y >> 11);
y ^= (y << 7) & 0x9d2c5680UL;
y ^= (y << 15) & 0xefc60000UL;
y ^= (y >> 18);
return y;
}
/* These real versions are due to Isaku Wada, 2002/01/09 added */
/* ------------- End original implementation. ----------------- */
#include <stdio.h>
#include <time.h>
static int initialized = 0;
void RAND_bytes (uint8_t *dst, int len)
{
int i;
if (!initialized) {
/* Seed the generator with an array from /dev/urandom if available
Otherwise use time() and clock() values */
FILE *urandom = fopen( "/dev/urandom", "rb" );
unsigned long init_key[10] = {};
int key_length = 0;
if (urandom) {
while (fread(&init_key[key_length++], sizeof(unsigned long), 1,
urandom) > 0 && key_length < 10);
fclose(urandom);
} else {
time_t t = time (NULL);
clock_t c = clock ();
init_key[0] = *((unsigned long *) dst);
init_key[1] = 0x6c69626e;
init_key[2] = 0x69636500;
init_key[3] = *(unsigned long *) &t;
init_key[4] = *(unsigned long *) &c;
key_length = 5;
}
init_by_array(init_key, key_length);
initialized = 1;
}
for (i = 0; i < len; i++) {
dst[i] = genrand_int32 () & 0xFF;
}
}
#endif /* _WIN32 */
/*
* This file is part of the Nice GLib ICE library.
*
* (C) 2008 Nokia Corporation. All rights reserved.
* (C) 2008 Collabora Ltd. All rights reserved.
* Contact: Youness Alaoui
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Nice GLib ICE library.
*
* The Initial Developers of the Original Code are Collabora Ltd and Nokia
* Corporation. All Rights Reserved.
*
* Alternatively, the contents of this file may be used under the terms of the
* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
* case the provisions of LGPL are applicable instead of those above. If you
* wish to allow use of your version of this file only under the terms of the
* LGPL and not to allow others to use your version of this file under the
* MPL, indicate your decision by deleting the provisions above and replace
* them with the notice and other provisions required by the LGPL. If you do
* not delete the provisions above, a recipient may use your version of this
* file under either the MPL or the LGPL.
*/
#ifndef RAND_H
#define RAND_H
#ifdef _WIN32
#include "win32_common.h"
#else
#include <stdint.h>
#endif
void RAND_bytes (uint8_t *dst, int len);
#endif /* RAND_H */
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
*/ */
#include "sha1.h" #include "sha1.h"
#include "utils.h"
#include <string.h> #include <string.h>
......
...@@ -37,16 +37,9 @@ ...@@ -37,16 +37,9 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef _WIN32 #include "sha1.h"
/* This is needed because openssl/rand.h will include windows.h which will #include "md5.h"
include winsock.h if WIN32_LEAN_AND_MEAN is not defined.. and it causes #include "rand.h"
some compilation issues with ws2def.h */
#define WIN32_LEAN_AND_MEAN
#endif
#include <sha1.h>
#include <md5.h>
#include <openssl/rand.h>
#include "stunmessage.h" #include "stunmessage.h"
#include "stunhmac.h" #include "stunhmac.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment