r2926 - in trunk/libmikey: include/libmikey keyagreement mikey

[mikma at minisip.org]

Author: mikma
Date: 2006-11-18 13:42:21 +0100 (Sat, 18 Nov 2006)
New Revision: 2926

Modified:
   trunk/libmikey/include/libmikey/keyagreement_psk.h
   trunk/libmikey/keyagreement/KeyAgreementPKE.cxx
   trunk/libmikey/keyagreement/keyagreement_psk.cxx
   trunk/libmikey/mikey/MikeyPayloadRAND.cxx
Log:
Use libmcrypto Rand class in libmikey, instead of calling RAND_bytes from
openssl directly.


Modified: trunk/libmikey/include/libmikey/keyagreement_psk.h
===================================================================
--- trunk/libmikey/include/libmikey/keyagreement_psk.h	2006-11-18 12:41:00 UTC (rev 2925)
+++ trunk/libmikey/include/libmikey/keyagreement_psk.h	2006-11-18 12:42:21 UTC (rev 2926)
@@ -27,8 +27,6 @@
 
 #include<libmikey/libmikey_config.h>
 
-#include<openssl/dh.h>
-#include<openssl/rand.h>
 #include<libmikey/keyagreement.h>
 #include<libmikey/oakley_groups.h>
 

Modified: trunk/libmikey/keyagreement/KeyAgreementPKE.cxx
===================================================================
--- trunk/libmikey/keyagreement/KeyAgreementPKE.cxx	2006-11-18 12:41:00 UTC (rev 2925)
+++ trunk/libmikey/keyagreement/KeyAgreementPKE.cxx	2006-11-18 12:42:21 UTC (rev 2926)
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include <libmikey/KeyAgreementPKE.h>
-#include <openssl/rand.h>
+#include <libmcrypto/rand.h>
 
 
 KeyAgreementPKE::KeyAgreementPKE(byte_t* envKeyT, int envKeyLength, EVP_PKEY* pubKeyResponderT)
@@ -34,7 +34,7 @@
 	}
 	
 	tgkPtr = new unsigned char[tgkLength];
-	RAND_bytes(tgkPtr, tgkLength);
+	Rand::randomize(tgkPtr, tgkLength);
 }
 
 void KeyAgreementPKE::genTranspEncrKey(byte_t* encrKey, int encrKeyLength){

Modified: trunk/libmikey/keyagreement/keyagreement_psk.cxx
===================================================================
--- trunk/libmikey/keyagreement/keyagreement_psk.cxx	2006-11-18 12:41:00 UTC (rev 2925)
+++ trunk/libmikey/keyagreement/keyagreement_psk.cxx	2006-11-18 12:42:21 UTC (rev 2926)
@@ -23,6 +23,7 @@
 
 
 #include<config.h>
+#include<libmcrypto/rand.h>
 #include<libmikey/MikeyMessage.h>
 #include<libmikey/keyagreement_psk.h>
 
@@ -51,7 +52,7 @@
 	}
 	
 	tgkPtr = new unsigned char[ tgkLength ];
-	RAND_bytes( tgkPtr, tgkLength );
+	Rand::randomize( tgkPtr, tgkLength );
 }
 
 void KeyAgreementPSK::genTranspEncrKey( 

Modified: trunk/libmikey/mikey/MikeyPayloadRAND.cxx
===================================================================
--- trunk/libmikey/mikey/MikeyPayloadRAND.cxx	2006-11-18 12:41:00 UTC (rev 2925)
+++ trunk/libmikey/mikey/MikeyPayloadRAND.cxx	2006-11-18 12:42:21 UTC (rev 2926)
@@ -30,13 +30,12 @@
 #include<stdlib.h>
 #include<time.h>
 #include<sys/types.h>
+#include<libmcrypto/rand.h>
 
 #ifndef _MSC_VER
 #include<unistd.h>
 #endif
 
-#include<openssl/rand.h>
-
 using namespace std;
 
 MikeyPayloadRAND::MikeyPayloadRAND( int randlen, byte_t * randDataPtr ){
@@ -71,16 +70,14 @@
 
 }
 
-#ifdef OPENSSL
 MikeyPayloadRAND::MikeyPayloadRAND():MikeyPayload(){
 	this->payloadTypeValue = MIKEYPAYLOAD_RAND_PAYLOAD_TYPE;
 	randLengthValue = 16;
 	
 	randDataPtr = new byte_t[ randLengthValue ];
-	RAND_bytes( randDataPtr, randLengthValue );
+	Rand::randomize( randDataPtr, randLengthValue );
 
 }
-#endif
 
 MikeyPayloadRAND::~MikeyPayloadRAND(){
 	if( randDataPtr ){