Changeset 504

Timestamp:

08/15/07 09:57:49 (1 year ago)

Author:

blackhedd

Message:

added SetTlsParms?

Files:

• version_0/ext/ed.cpp (modified) (1 diff)
• version_0/ext/ed.h (modified) (3 diffs)

version_0/ext/ed.cpp

@@ -624 +624 @@
-                throw std::runtime_error ("SSL/TLS already running on connection");
-
-
+, PrivateKeyFilename, CertChainFilename
-        _DispatchCiphertext();
+        #endif
+
+        #ifdef WITHOUT_SSL
+        throw std::runtime_error ("Encryption not available on this event-machine");
+        #endif
+}
+
+
+/*********************************
+ConnectionDescriptor::SetTlsParms
+*********************************/
+
+void ConnectionDescriptor::SetTlsParms (const char *privkey_filename, const char *certchain_filename)
+{
+        #ifdef WITH_SSL
+        if (SslBox)
+                throw std::runtime_error ("call SetTlsParms before calling StartTls");
+        if (privkey_filename && *privkey_filename)
+                PrivateKeyFilename = privkey_filename;
+        if (certchain_filename && *certchain_filename)
+                CertChainFilename = certchain_filename;
-        #endif
-

version_0/ext/ed.h

@@ -66 +66 @@
-
-                virtual void StartTls() {}
+                virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename) {}
-
-                // Properties: return 0/1 to signify T/F, and handle the values
@@ -149 +150 @@
-
-                virtual void StartTls();
+                virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename);
-                void SetServerMode() {bIsServer = true;}
-
@@ -175 +177 @@
-                #ifdef WITH_SSL
-                SslBox_t *SslBox;
+                std::string CertChainFilename;
+                std::string PrivateKeyFilename;
-                #endif
-                bool bIsServer;