Added generic TLS purposes

diff --git a/src/libtls/tls.h b/src/libtls/tls.h
index 36ca59201905bb1957daa58dfcb75d8b9c19e512..aa840f8fe0faf369d163e89bc3a934a977ae2fbf 100644 (file)
--- a/src/libtls/tls.h
+++ b/src/libtls/tls.h
@@ -98,6 +98,10 @@ enum tls_purpose_t {
        TLS_PURPOSE_EAP_TTLS,
        /** EAP-TTLS with client authentication */
        TLS_PURPOSE_EAP_TTLS_CLIENT_AUTH,
+       /** non-EAP TLS without client authentication */
+       TLS_PURPOSE_GENERIC,
+       /** non-EAP TLS with client authentication */
+       TLS_PURPOSE_GENERIC_CLIENT_AUTH,
 };
 
 /**

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index a12944af13b765ae45a9f8137d241edc5bde96ad..12c6b98517935d56a1f4a2587e511608cea7a4d5 100644 (file)
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -862,13 +862,16 @@ METHOD(tls_crypto_t, change_cipher, void,
 METHOD(tls_crypto_t, derive_eap_msk, void,
        private_tls_crypto_t *this, chunk_t client_random, chunk_t server_random)
 {
-       chunk_t seed;
+       if (this->msk_label)
+       {
+               chunk_t seed;
 
-       seed = chunk_cata("cc", client_random, server_random);
-       free(this->msk.ptr);
-       this->msk = chunk_alloc(64);
-       this->prf->get_bytes(this->prf, this->msk_label, seed,
-                                                this->msk.len, this->msk.ptr);
+               seed = chunk_cata("cc", client_random, server_random);
+               free(this->msk.ptr);
+               this->msk = chunk_alloc(64);
+               this->prf->get_bytes(this->prf, this->msk_label, seed,
+                                                        this->msk.len, this->msk.ptr);
+       }
 }
 
 METHOD(tls_crypto_t, get_eap_msk, chunk_t,
@@ -931,6 +934,10 @@ tls_crypto_t *tls_crypto_create(tls_t *tls)
                        this->msk_label = "ttls keying material";
                        build_cipher_suite_list(this, TRUE);
                        break;
+               case TLS_PURPOSE_GENERIC:
+               case TLS_PURPOSE_GENERIC_CLIENT_AUTH:
+                       build_cipher_suite_list(this, TRUE);
+                       break;
        }
        return &this->public;
 }

diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c
index 77e26d6fac6b63a3f0a4c098c732a3df3e44c03e..a1697704560c8f2bead7a2f2c6ae3e135a3304b0 100644 (file)
--- a/src/libtls/tls_server.c
+++ b/src/libtls/tls_server.c
@@ -683,9 +683,11 @@ tls_server_t *tls_server_create(tls_t *tls,
        {
                case TLS_PURPOSE_EAP_TLS:
                case TLS_PURPOSE_EAP_TTLS_CLIENT_AUTH:
+               case TLS_PURPOSE_GENERIC_CLIENT_AUTH:
                        this->request_peer_auth = TRUE;
                        break;
                case TLS_PURPOSE_EAP_TTLS:
+               case TLS_PURPOSE_GENERIC:
                        break;
        }
        return &this->public;