Added gnutls_db_get_cache_expiration()

Conflicts:
	lib/libgnutls.map

3 files changed, 14 insertions, 0 deletions

diff --git a/lib/gnutls_db.c b/lib/gnutls_db.c
index faa158c09c..25acc4ca3a 100644
--- a/lib/gnutls_db.c
+++ b/lib/gnutls_db.c
@@ -130,6 +130,18 @@ void gnutls_db_set_cache_expiration(gnutls_session_t session, int seconds)
 }
 
 /**
+ * gnutls_db_get_cache_expiration:
+ *
+ * Returns: the expiration time (in seconds) of stored sessions for resumption. 
+ *
+ * Since 3.2.10
+ **/
+unsigned gnutls_db_get_cache_expiration(void)
+{
+	return DEFAULT_EXPIRE_TIME;
+}
+
+/**
  * gnutls_db_check_entry:
  * @session: is a #gnutls_session_t structure.
  * @session_entry: is the session data (not key)
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 0818ba7f0a..ee8f20dc49 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1171,6 +1171,7 @@ typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key);
 typedef gnutls_datum_t(*gnutls_db_retr_func) (void *, gnutls_datum_t key);
 
 void gnutls_db_set_cache_expiration(gnutls_session_t session, int seconds);
+unsigned gnutls_db_get_cache_expiration(void);
 
 void gnutls_db_remove_session(gnutls_session_t session);
 void gnutls_db_set_retrieve_function(gnutls_session_t session,
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 1a7b3b832f..01c15fd3f6 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -922,6 +922,7 @@ GNUTLS_3_1_0 {
         gnutls_x509_crl_get_raw_issuer_dn;
         gnutls_certificate_get_crt_raw;
 	gnutls_record_check_corked;
+	gnutls_db_get_cache_expiration;
 } GNUTLS_3_0_0;
 
 GNUTLS_PRIVATE {