r3078 - in trunk/libmikey: . include/libmikey mikey

[mikma at minisip.org]

Author: mikma
Date: 2007-01-02 23:23:57 +0100 (Tue, 02 Jan 2007)
New Revision: 3078

Modified:
   trunk/libmikey/Makefile.am
   trunk/libmikey/TODO
   trunk/libmikey/configure.ac
   trunk/libmikey/include/libmikey/MikeyPayloadRAND.h
   trunk/libmikey/mikey/MikeyMessage.cxx
Log:
Remove all OpenSSL dependencies in libmikey


Modified: trunk/libmikey/Makefile.am
===================================================================
--- trunk/libmikey/Makefile.am	2007-01-02 10:19:23 UTC (rev 3077)
+++ trunk/libmikey/Makefile.am	2007-01-02 22:23:57 UTC (rev 3078)
@@ -14,11 +14,6 @@
 
 libmikey_la_SOURCES = $(mikey_src) $(ka_src)
 
-if HAVE_OPENSSL
-libmikey_la_SOURCES += $(ossl_src)
-libmikey_la_LIBADD += $(OPENSSL_LIBS)
-endif HAVE_OPENSSL
-
 if OS_WIN
 res_obj = win32/libmikey-res.o
 libmikey_la_LDFLAGS += -Wl,$(res_obj)
@@ -34,6 +29,8 @@
                      mikey/MikeyMessagePSK.cxx \
                      mikey/MikeyMessageDHHMAC.h \
                      mikey/MikeyMessageDHHMAC.cxx \
+                     mikey/MikeyMessagePKE.h \
+                     mikey/MikeyMessagePKE.cxx \
                      mikey/MikeyPayloadCERT.cxx \
                      mikey/MikeyPayloadCHASH.cxx \
                      mikey/MikeyPayload.cxx \
@@ -58,10 +55,6 @@
 	             keyagreement/KeyAgreementDHHMAC.cxx \
 		     keyagreement/keyvalidity.cxx
 
-ossl_src = \
-		mikey/MikeyMessagePKE.h \
-		mikey/MikeyMessagePKE.cxx
-
 # maintainer rules
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 MAINTAINERCLEANFILES = \

Modified: trunk/libmikey/TODO
===================================================================
--- trunk/libmikey/TODO	2007-01-02 10:19:23 UTC (rev 3077)
+++ trunk/libmikey/TODO	2007-01-02 22:23:57 UTC (rev 3078)
@@ -3,4 +3,3 @@
 * add a namespace
 * add a CallerInterface, to report errors
 * use MObject everywhere
-* remove all OpenSSL dependencies

Modified: trunk/libmikey/configure.ac
===================================================================
--- trunk/libmikey/configure.ac	2007-01-02 10:19:23 UTC (rev 3077)
+++ trunk/libmikey/configure.ac	2007-01-02 22:23:57 UTC (rev 3078)
@@ -26,16 +26,7 @@
 AM_MINISIP_CHECK_COMPLETE
 
 dnl Checks for libraries.
-AC_ARG_WITH(openssl,
-    AS_HELP_STRING([--with-openssl=PATH], [Use OpenSSL library [default=yes]]),
-    [], [with_openssl="yes"])
 
-if test "${with_openssl}" = "yes"; then
-    AM_LIBMCRYPTO_CHECK_OPENSSL([HAVE_OPENSSL=yes],[HAVE_OPENSSL=no])
-    AC_CHECK_HEADERS([openssl/rsa.h openssl/evp.h])
-fi
-AM_CONDITIONAL(HAVE_OPENSSL, test "${HAVE_OPENSSL}" = "yes")
-
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([malloc.h stdlib.h string.h unistd.h])

Modified: trunk/libmikey/include/libmikey/MikeyPayloadRAND.h
===================================================================
--- trunk/libmikey/include/libmikey/MikeyPayloadRAND.h	2007-01-02 10:19:23 UTC (rev 3077)
+++ trunk/libmikey/include/libmikey/MikeyPayloadRAND.h	2007-01-02 22:23:57 UTC (rev 3078)
@@ -27,7 +27,6 @@
 
 #include<libmikey/libmikey_config.h>
 
-#define OPENSSL
 #include<libmikey/MikeyPayload.h>
 
 #define MIKEYPAYLOAD_RAND_PAYLOAD_TYPE 11
@@ -38,9 +37,7 @@
 */
 class LIBMIKEY_API MikeyPayloadRAND : public MikeyPayload{
 	public:
-#ifdef OPENSSL
 		MikeyPayloadRAND(); // computes a 128 bits random value
-#endif
 		// FIXME almost same prototype, leads to mistake!!
 		MikeyPayloadRAND( int randlen, byte_t * rand_data );
 		MikeyPayloadRAND( byte_t * start, int lengthLimit );

Modified: trunk/libmikey/mikey/MikeyMessage.cxx
===================================================================
--- trunk/libmikey/mikey/MikeyMessage.cxx	2007-01-02 10:19:23 UTC (rev 3077)
+++ trunk/libmikey/mikey/MikeyMessage.cxx	2007-01-02 22:23:57 UTC (rev 3078)
@@ -87,13 +87,11 @@
 	return new MikeyMessageDHHMAC( ka, macAlg );
 }
 
-#ifdef HAVE_OPENSSL
 MikeyMessage* MikeyMessage::create( KeyAgreementPKE* ka,
 				    int encrAlg, int macAlg,
 				    MRef<certificate*> certInitiator ){
 	return new MikeyMessagePKE( ka, encrAlg, macAlg, certInitiator );
 }
-#endif	// HAVE_OPENSSL
 
 /*
  * Alg.
@@ -129,12 +127,10 @@
 		case MIKEY_TYPE_PSK_RESP:
 			msg = new MikeyMessagePSK();
 			break;
-#ifdef HAVE_OPENSSL
 		case MIKEY_TYPE_PK_INIT:
 		case MIKEY_TYPE_PK_RESP:
 			msg = new MikeyMessagePKE();
 			break;
-#endif	// HAVE_OPENSSL
 		case MIKEY_TYPE_DHHMAC_INIT:
 		case MIKEY_TYPE_DHHMAC_RESP:
 			msg = new MikeyMessageDHHMAC();