libtls: Add getters for TLS handshake authentication details
authorMartin Willi <martin@revosec.ch>
Thu, 29 Jan 2015 10:13:42 +0000 (11:13 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 3 Mar 2015 13:08:00 +0000 (14:08 +0100)
src/libtls/tls.c
src/libtls/tls.h
src/libtls/tls_eap.c
src/libtls/tls_eap.h
src/libtls/tls_handshake.h
src/libtls/tls_peer.c
src/libtls/tls_server.c

index 2016124..08a06f5 100644 (file)
@@ -415,6 +415,12 @@ METHOD(tls_t, get_eap_msk, chunk_t,
        return this->crypto->get_eap_msk(this->crypto);
 }
 
+METHOD(tls_t, get_auth, auth_cfg_t*,
+       private_tls_t *this)
+{
+       return this->handshake->get_auth(this->handshake);
+}
+
 METHOD(tls_t, destroy, void,
        private_tls_t *this)
 {
@@ -465,6 +471,7 @@ tls_t *tls_create(bool is_server, identification_t *server,
                        .get_purpose = _get_purpose,
                        .is_complete = _is_complete,
                        .get_eap_msk = _get_eap_msk,
+                       .get_auth = _get_auth,
                        .destroy = _destroy,
                },
                .is_server = is_server,
index fc1d9b9..f3dc198 100644 (file)
@@ -252,6 +252,13 @@ struct tls_t {
        chunk_t (*get_eap_msk)(tls_t *this);
 
        /**
+        * Get the authentication details after completing the handshake.
+        *
+        * @return                      authentication details, internal data
+        */
+       auth_cfg_t* (*get_auth)(tls_t *this);
+
+       /**
         * Destroy a tls_t.
         */
        void (*destroy)(tls_t *this);
index ebe5bc3..12d5aed 100644 (file)
@@ -426,6 +426,12 @@ METHOD(tls_eap_t, set_identifier, void,
        this->identifier = identifier;
 }
 
+METHOD(tls_eap_t, get_auth, auth_cfg_t*,
+       private_tls_eap_t *this)
+{
+       return this->tls->get_auth(this->tls);
+}
+
 METHOD(tls_eap_t, destroy, void,
        private_tls_eap_t *this)
 {
@@ -453,6 +459,7 @@ tls_eap_t *tls_eap_create(eap_type_t type, tls_t *tls, size_t frag_size,
                        .get_msk = _get_msk,
                        .get_identifier = _get_identifier,
                        .set_identifier = _set_identifier,
+                       .get_auth = _get_auth,
                        .destroy = _destroy,
                },
                .type = type,
index f3fbba0..df41fc4 100644 (file)
@@ -77,6 +77,13 @@ struct tls_eap_t {
        void (*set_identifier) (tls_eap_t *this, uint8_t identifier);
 
        /**
+        * Get the authentication details after completing the handshake.
+        *
+        * @return                              authentication details, internal data
+        */
+       auth_cfg_t* (*get_auth)(tls_eap_t *this);
+
+       /**
         * Destroy a tls_eap_t.
         */
        void (*destroy)(tls_eap_t *this);
index 7fa660c..7edb49b 100644 (file)
@@ -98,6 +98,13 @@ struct tls_handshake_t {
        identification_t* (*get_server_id)(tls_handshake_t *this);
 
        /**
+        * Get the peers authentication information after completing the handshake.
+        *
+        * @return                      authentication data, internal data
+        */
+       auth_cfg_t* (*get_auth)(tls_handshake_t *this);
+
+       /**
         * Destroy a tls_handshake_t.
         */
        void (*destroy)(tls_handshake_t *this);
index 1bee436..08e36de 100644 (file)
@@ -1154,6 +1154,12 @@ METHOD(tls_handshake_t, get_server_id, identification_t*,
        return this->server;
 }
 
+METHOD(tls_handshake_t, get_auth, auth_cfg_t*,
+       private_tls_peer_t *this)
+{
+       return this->server_auth;
+}
+
 METHOD(tls_handshake_t, destroy, void,
        private_tls_peer_t *this)
 {
@@ -1187,6 +1193,7 @@ tls_peer_t *tls_peer_create(tls_t *tls, tls_crypto_t *crypto, tls_alert_t *alert
                                .finished = _finished,
                                .get_peer_id = _get_peer_id,
                                .get_server_id = _get_server_id,
+                               .get_auth = _get_auth,
                                .destroy = _destroy,
                        },
                },
index a861a26..b6e706d 100644 (file)
@@ -1074,6 +1074,12 @@ METHOD(tls_handshake_t, get_server_id, identification_t*,
        return this->server;
 }
 
+METHOD(tls_handshake_t, get_auth, auth_cfg_t*,
+       private_tls_server_t *this)
+{
+       return this->peer_auth;
+}
+
 METHOD(tls_handshake_t, destroy, void,
        private_tls_server_t *this)
 {
@@ -1108,6 +1114,7 @@ tls_server_t *tls_server_create(tls_t *tls,
                                .finished = _finished,
                                .get_peer_id = _get_peer_id,
                                .get_server_id = _get_server_id,
+                               .get_auth = _get_auth,
                                .destroy = _destroy,
                        },
                },