tls: Support a null encryption flag on TLS socket abstraction
authorMartin Willi <martin@revosec.ch>
Tue, 25 Mar 2014 09:19:41 +0000 (10:19 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 1 Apr 2014 12:28:55 +0000 (14:28 +0200)
src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c
src/libpttls/pt_tls_client.c
src/libpttls/pt_tls_server.c
src/libtls/tls_socket.c
src/libtls/tls_socket.h

index 5206ba4..af1b28a 100644 (file)
@@ -876,7 +876,8 @@ static bool soap_init(private_tnc_ifmap_soap_t *this)
        }
 
        /* open TLS socket */
-       this->tls = tls_socket_create(FALSE, server_id, client_id, this->fd, NULL);
+       this->tls = tls_socket_create(FALSE, server_id, client_id, this->fd,
+                                                                 NULL, FALSE);
        if (!this->tls)
        {
                DBG1(DBG_TNC, "creating TLS socket failed");
@@ -923,4 +924,3 @@ tnc_ifmap_soap_t *tnc_ifmap_soap_create()
 
        return &this->public;
 }
-
index 01a84cd..98a2f4b 100644 (file)
@@ -84,7 +84,8 @@ static bool make_connection(private_pt_tls_client_t *this)
                return FALSE;
        }
 
-       this->tls = tls_socket_create(FALSE, this->server, this->client, fd, NULL);
+       this->tls = tls_socket_create(FALSE, this->server, this->client, fd,
+                                                                 NULL, FALSE);
        if (!this->tls)
        {
                close(fd);
index 9af00e7..3c07475 100644 (file)
@@ -532,7 +532,7 @@ pt_tls_server_t *pt_tls_server_create(identification_t *server, int fd,
                        .destroy = _destroy,
                },
                .state = PT_TLS_SERVER_VERSION,
-               .tls = tls_socket_create(TRUE, server, NULL, fd, NULL),
+               .tls = tls_socket_create(TRUE, server, NULL, fd, NULL, FALSE),
                .tnccs = (tls_t*)tnccs,
                .auth = auth,
        );
index 1923275..4b18fa6 100644 (file)
@@ -406,9 +406,11 @@ METHOD(tls_socket_t, destroy, void,
  * See header
  */
 tls_socket_t *tls_socket_create(bool is_server, identification_t *server,
-                                                       identification_t *peer, int fd, tls_cache_t *cache)
+                                                       identification_t *peer, int fd, tls_cache_t *cache,
+                                                       bool nullok)
 {
        private_tls_socket_t *this;
+       tls_purpose_t purpose;
 
        INIT(this,
                .public = {
@@ -430,7 +432,16 @@ tls_socket_t *tls_socket_create(bool is_server, identification_t *server,
                .fd = fd,
        );
 
-       this->tls = tls_create(is_server, server, peer, TLS_PURPOSE_GENERIC,
+       if (nullok)
+       {
+               purpose = TLS_PURPOSE_GENERIC_NULLOK;
+       }
+       else
+       {
+               purpose = TLS_PURPOSE_GENERIC;
+       }
+
+       this->tls = tls_create(is_server, server, peer, purpose,
                                                   &this->app.application, cache);
        if (!this->tls)
        {
index 75130a4..54278dd 100644 (file)
@@ -104,9 +104,11 @@ struct tls_socket_t {
  * @param peer                         client identity, NULL for no client authentication
  * @param fd                           socket to read/write from
  * @param cache                                session cache to use, or NULL
+ * @param nullok                       accept NULL encryption ciphers
  * @return                                     TLS socket wrapper
  */
 tls_socket_t *tls_socket_create(bool is_server, identification_t *server,
-                                                       identification_t *peer, int fd, tls_cache_t *cache);
+                                                       identification_t *peer, int fd, tls_cache_t *cache,
+                                                       bool nullok);
 
 #endif /** TLS_SOCKET_H_ @}*/