Add support for OpenSSL AES and RNG modules

Makefile.in

@@ -53,6 +53,8 @@ EXE	= @EXE@
 gdoi	= @GDOI_OBJS@
 # Random source.
 RNG_OBJS = @RNG_OBJS@
+RNG_EXTRA_OBJS = @RNG_EXTRA_OBJS@
+AES_ICM_OBJ = @AES_ICM_OBJ@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -75,7 +77,7 @@ libdir = @libdir@
 
 # libcrypt.a (the crypto engine) 
 ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o      \
-          crypto/cipher/aes.o crypto/cipher/aes_icm.o             \
+          crypto/cipher/aes.o crypto/cipher/$(AES_ICM_OBJ)        \
           crypto/cipher/aes_cbc.o
 
 hashes  = crypto/hash/null_auth.o crypto/hash/sha1.o \
@@ -88,7 +90,7 @@ math    = crypto/math/datatypes.o crypto/math/stat.o
 
 ust     = crypto/ust/ust.o 
 
-rng     = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o
+rng     = crypto/rng/$(RNG_OBJS) $(RNG_EXTRA_OBJS) 
 
 err     = crypto/kernel/err.o
 

config_in.h

@@ -141,6 +141,9 @@
 /* Define to use GDOI. */
 #undef SRTP_GDOI
 
+/* Define to use OpenSSL crypto. */
+#undef OPENSSL
+
 /* Define to compile for kernel contexts. */
 #undef SRTP_KERNEL