Admin Server SSL verschlüsselt

RegisterServer/RegisterServer.cpp

@@ -19,7 +19,10 @@ RegisterServer::RegisterServer( InitDatei *zIni )
 	ini = zIni->getThis();
 	id = *zIni->zWert( "ServerId" );
 	server = new Server();
-	aServer = new Server();
+	aServer = new SSLServer();
+    aServer->setPrivateKeyPassword( zIni->zWert( "SSLPasswort" )->getText() );
+    aServer->setCertificateFile( zIni->zWert( "SSLCert" )->getText() );
+    aServer->setPrivateKeyFile( zIni->zWert( "SSLKey" )->getText() );
 	std::cout << "RS: Starten des Admin Servers...\n";
 	if( !aServer->verbinde( (unsigned short)TextZuInt( ini->zWert( "AdminServerPort" )->getText(), 10 ), 10 ) )
 	{
@@ -59,7 +62,7 @@ void RegisterServer::runn()
 {
 	while( !end )
 	{
-		SKlient *klient;
+		SSLSKlient *klient;
 		klient = aServer->getKlient();
 		if( end && klient )
 		{
@@ -304,13 +307,10 @@ RegisterServer *RegisterServer::release()
 
 // Inhalt der RSAKlient Klasse aus RegisterServer.h
 // Konstruktor 
-RSAKlient::RSAKlient( SKlient *klient, RegisterServer *rs )
+RSAKlient::RSAKlient( SSLSKlient *klient, RegisterServer *rs )
 : Thread()
 {
 	this->klient = klient;
-	unsigned char key[ 20 ] = { 246, 1, 73, 51, 10, 103, 151, 180, 17, 220, 28, 241, 131, 229, 66, 137, 175, 218, 133, 58 };
-	klient->setSendeKey( (char*)key, 20 );
-	klient->setEmpfangKey( (char*)key, 20 );
 	name = new Text( "" );
 	passwort = new Text( "" );
 	adminId = 0;
@@ -334,7 +334,7 @@ void RSAKlient::thread()
 	while( 1 )
 	{
 		char c = 0;
-		if( !klient->getNachrichtEncrypted( &c, 1 ) )
+		if( !klient->getNachricht( &c, 1 ) )
 			break;
 		else
 		{
@@ -344,23 +344,23 @@ void RSAKlient::thread()
 			case 1: // Login
 				if( 1 )
 				{
-					klient->sendeEncrypted( "\1", 1 );
+					klient->sende( "\1", 1 );
 					unsigned char nLen = 0;
-					klient->getNachrichtEncrypted( (char*)&nLen, 1 );
+					klient->getNachricht( (char*)&nLen, 1 );
 					char *n = new char[ nLen + 1 ];
 					n[ (int)nLen ] = 0;
 					if( nLen )
-						klient->getNachrichtEncrypted( n, nLen );
+						klient->getNachricht( n, nLen );
 					unsigned char pLen = 0;
-					klient->getNachrichtEncrypted( (char*)&pLen, 1 );
+					klient->getNachricht( (char*)&pLen, 1 );
 					char *p = new char[ pLen + 1 ];
 					p[ (int)pLen ] = 0;
 					if( pLen )
-						klient->getNachrichtEncrypted( p, pLen );
+						klient->getNachricht( p, pLen );
 					int adminId = rs->zDB()->istAdministrator( n, p );
 					if( adminId )
 					{
-						klient->sendeEncrypted( "\1", 1 );
+						klient->sende( "\1", 1 );
 						name->setText( n );
 						passwort->setText( p );
 						this->adminId = adminId;
@@ -375,11 +375,11 @@ void RSAKlient::thread()
 				adminId = 0;
 				name->setText( "" );
 				passwort->setText( "" );
-				klient->sendeEncrypted( "\1", 1 );
+				klient->sende( "\1", 1 );
 				break;
 			case 3: // Trennen
 				br = 1;
-				klient->sendeEncrypted( "\1", 1 );
+				klient->sende( "\1", 1 );
 				break;
 			case 4: // Server starten
 				if( !adminId )
@@ -396,7 +396,7 @@ void RSAKlient::thread()
 							err->release();
 						}
 						else
-							klient->sendeEncrypted( "\1", 1 );
+							klient->sende( "\1", 1 );
 					}
 					else
 						errorZuKlient( "Du bist nicht berechtigt den Server zu starten." );
@@ -410,7 +410,7 @@ void RSAKlient::thread()
 					if( rs->zDB()->adminHatRecht( adminId, Admin_Recht::RSBeenden ) )
 					{
 						if( rs->serverBeenden() )
-							klient->sendeEncrypted( "\1", 1 );
+							klient->sende( "\1", 1 );
 						else
 						{
 							Text *err = new Text();
@@ -455,7 +455,7 @@ void RSAKlient::thread()
 					}
 					if( ok )
 					{
-						klient->sendeEncrypted( "\1", 1 );
+						klient->sende( "\1", 1 );
 						std::cout << "RS: Der Server wird von Benutzer " << adminId << " heruntergefahren.\n";
 						rs->close();
 						br = 1;
@@ -482,7 +482,7 @@ void RSAKlient::thread()
 						ok = 1;
 					if( ok )
 					{
-						klient->sendeEncrypted( "\1", 1 );
+						klient->sende( "\1", 1 );
 						std::cout << "RS: Der Server wurde von Benutzer " << adminId << " terminiert.\n";
 						rs->close();
 						br = 1;
@@ -499,8 +499,8 @@ void RSAKlient::thread()
 						if( rs->istAn() )
 							status = 2;
 					}
-					klient->sendeEncrypted( "\1", 1 );
-					klient->sendeEncrypted( &status, 1 );
+					klient->sende( "\1", 1 );
+					klient->sende( &status, 1 );
 				}
 				break;
 			case 9: // Server pausieren
@@ -508,9 +508,9 @@ void RSAKlient::thread()
 					errorZuKlient( "Du musst dich einloggen." );
 				else
 				{
-					klient->sendeEncrypted( "\1", 1 );
+					klient->sende( "\1", 1 );
 					char pause = 0;
-					klient->getNachrichtEncrypted( &pause, 1 );
+					klient->getNachricht( &pause, 1 );
 					if( rs->zDB()->adminHatRecht( adminId, Admin_Recht::RSPausieren ) )
 					{
 						bool ok = 0;
@@ -519,7 +519,7 @@ void RSAKlient::thread()
 						else
 							ok = rs->serverFortsetzen();
 						if( ok )
-							klient->sendeEncrypted( "\1", 1 );
+							klient->sende( "\1", 1 );
 						else
 						{
 							Text *err = new Text();
@@ -542,13 +542,13 @@ void RSAKlient::thread()
 					errorZuKlient( "Du musst dich einloggen." );
 				else
 				{
-					klient->sendeEncrypted( "\1", 1 );
+					klient->sende( "\1", 1 );
 					int maxC = 0;
-					klient->getNachrichtEncrypted( (char*)&maxC, 4 );
+					klient->getNachricht( (char*)&maxC, 4 );
 					if( rs->zDB()->adminHatRecht( adminId, Admin_Recht::RSMCChange ) )
 					{
 						if( rs->setMaxKlients( maxC ) )
-							klient->sendeEncrypted( "\1", 1 );
+							klient->sende( "\1", 1 );
 						else
 						{
 							Text *err = new Text();
@@ -564,13 +564,13 @@ void RSAKlient::thread()
             case 0xC: // klient absturtz
                 if( 1 )
                 {
-                    klient->sendeEncrypted( "\1", 1 );
+                    klient->sende( "\1", 1 );
                     int klientId = 0;
-                    klient->getNachrichtEncrypted( (char*)&klientId, 4 );
+                    klient->getNachricht( (char*)&klientId, 4 );
                     if( klientId && rs->absturzKlient( klientId ) )
-                        klient->sendeEncrypted( "\1", 1 );
+                        klient->sende( "\1", 1 );
                     else
-                        klient->sendeEncrypted( "\0", 1 );
+                        klient->sende( "\0", 1 );
                 }
                 break;
 			default:
@@ -590,10 +590,10 @@ void RSAKlient::thread()
 
 void RSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehlernachricht zum Klient
 {
-	klient->sendeEncrypted( "\3", 1 );
+	klient->sende( "\3", 1 );
 	char len = (char)textLength( nachricht );
-	klient->sendeEncrypted( &len, 1 );
-	klient->sendeEncrypted( nachricht, len );
+	klient->sende( &len, 1 );
+	klient->sende( nachricht, len );
 }
 
 

RegisterServer/RegisterServer.h

@@ -17,7 +17,7 @@ class RegisterServer : public Thread
 {
 private:
 	Server *server;
-	Server *aServer;
+	SSLServer *aServer;
 	InitDatei *ini;
 	RSDatenbank *db;
 	CRITICAL_SECTION cs;
@@ -66,7 +66,7 @@ public:
 class RSAKlient : public Thread
 {
 private:
-	SKlient *klient;
+	SSLSKlient *klient;
 	Text *name;
 	Text *passwort;
 	int adminId;
@@ -75,7 +75,7 @@ private:
 
 public:
 	// Konstruktor 
-	RSAKlient( SKlient *klient, RegisterServer *rs );
+	RSAKlient( SSLSKlient *klient, RegisterServer *rs );
 	// Destruktor 
 	virtual ~RSAKlient();
 	// nicht constant

RegisterServer/main.cpp

@@ -32,7 +32,7 @@ int main()
 		dat->release();
 		exit( 1 );
 	}
-    const char *wichtig[] = { "ServerId", "DBBenutzer", "DBPasswort", "DBName", "DBIP", "DBPort", "Aktiv", "Java", "Mailer", "PHP", "AccountActivationMail" };
+    const char *wichtig[] = { "ServerId", "DBBenutzer", "DBPasswort", "DBName", "DBIP", "DBPort", "Aktiv", "Java", "Mailer", "PHP", "AccountActivationMail", "SSLCert", "SSLKey", "SSLPasswort" };
     for( const char *w : wichtig )
     {
         if( !dat->wertExistiert( w ) )