[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-55-g647edb3

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=647edb316fa9f7415a9d4ff7a1ab4b12b5580563

The branch, master has been updated
       via  647edb316fa9f7415a9d4ff7a1ab4b12b5580563 (commit)
       via  53dae4b4ed9c43025fd88aa16e4ae511cc097e88 (commit)
       via  1ea253d81ceae1ce5fc342fe4b494c2bf409f81a (commit)
      from  6402455d8a63ecc5822504adb0ee9c5741ff8a4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 647edb316fa9f7415a9d4ff7a1ab4b12b5580563
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 10 12:39:01 2011 +0100

    Add explicit digest mapping functions (for OCSP).

commit 53dae4b4ed9c43025fd88aa16e4ae511cc097e88
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 10 12:37:04 2011 +0100

    Make verify-high structures internally accessible (for OCSP).

commit 1ea253d81ceae1ce5fc342fe4b494c2bf409f81a
Author: Simon Josefsson <address@hidden>
Date:   Thu Nov 10 12:34:57 2011 +0100

    Indent.

-----------------------------------------------------------------------

Summary of changes:
 lib/algorithms.h       |    5 +++++
 lib/algorithms/mac.c   |   18 ++++++++++++++++++
 lib/libgnutls.map      |    8 ++++----
 lib/x509/Makefile.am   |    5 +++--
 lib/x509/verify-high.c |   26 +-------------------------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/algorithms.h b/lib/algorithms.h
index 5279e94..4b0ce60 100644
--- a/lib/algorithms.h
+++ b/lib/algorithms.h
@@ -53,6 +53,11 @@ int _gnutls_mac_is_ok (gnutls_mac_algorithm_t algorithm);
 gnutls_mac_algorithm_t _gnutls_x509_oid2mac_algorithm (const char *oid);
 const char *_gnutls_x509_mac_to_oid (gnutls_mac_algorithm_t mac);
 
+/* Functions for digests. */
+gnutls_digest_algorithm_t _gnutls_x509_oid2digest_algorithm (const char *oid);
+const char *_gnutls_x509_digest_to_oid (gnutls_digest_algorithm_t algorithm);
+const char *_gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm);
+
 /* Functions for cipher suites. */
 int _gnutls_supported_ciphersuites (gnutls_session_t session,
                                     uint8_t* cipher_suites, int 
max_cipher_suite_size);
diff --git a/lib/algorithms/mac.c b/lib/algorithms/mac.c
index f0b8ff4..27b6ca4 100644
--- a/lib/algorithms/mac.c
+++ b/lib/algorithms/mac.c
@@ -190,6 +190,24 @@ _gnutls_x509_oid2mac_algorithm (const char *oid)
   return ret;
 }
 
+const char *
+_gnutls_x509_digest_to_oid (gnutls_digest_algorithm_t algorithm)
+{
+  return _gnutls_x509_mac_to_oid ((gnutls_mac_algorithm_t) algorithm);
+}
+
+gnutls_digest_algorithm_t
+_gnutls_x509_oid2digest_algorithm (const char *oid)
+{
+  return (gnutls_digest_algorithm_t) _gnutls_x509_oid2mac_algorithm (oid);
+}
+
+const char *
+_gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm)
+{
+  return gnutls_mac_get_name ((gnutls_digest_algorithm_t) algorithm);
+}
+
 int
 _gnutls_mac_is_ok (gnutls_mac_algorithm_t algorithm)
 {
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 40de726..813a3cd 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -720,10 +720,10 @@ GNUTLS_3_0_0 {
        gnutls_x509_crt_get_authority_info_access;
        gnutls_privkey_import_ext;
        gnutls_certificate_set_key;
-        gnutls_srp_3072_group_generator;
-        gnutls_srp_3072_group_prime;
-        gnutls_srp_4096_group_generator;
-        gnutls_srp_4096_group_prime;
+       gnutls_srp_3072_group_generator;
+       gnutls_srp_3072_group_prime;
+       gnutls_srp_4096_group_generator;
+       gnutls_srp_4096_group_prime;
 } GNUTLS_2_12;
 
 GNUTLS_PRIVATE {
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index f5f6eff..68412c7 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -54,5 +54,6 @@ libgnutls_x509_la_SOURCES =   \
        verify.c                \
        x509.c                  \
        x509_int.h              \
-       x509_write.c    \
-       verify-high.c
+       x509_write.c            \
+       verify-high.c           \
+       verify-high.h
diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index 17ede24..b0efe32 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -32,33 +32,9 @@
 #include <hash.h>
 #include "x509_int.h"
 #include <common.h>
+#include "verify-high.h"
 
 #define DEFAULT_SIZE 503
-#define INIT_HASH 0x33a1
-
-struct named_cert_st {
-    gnutls_x509_crt_t cert;
-    uint8_t name[MAX_NAME_SIZE];
-    unsigned int name_size;
-};
-
-struct node_st {
-    /* The trusted certificates */
-    gnutls_x509_crt_t *trusted_cas;
-    unsigned int trusted_ca_size;
-
-    struct named_cert_st *named_certs;
-    unsigned int named_cert_size;
-
-    /* The trusted CRLs */
-    gnutls_x509_crl_t *crls;
-    unsigned int crl_size;
-};
-
-struct gnutls_x509_trust_list_st {
-    int size;
-    struct node_st *node;
-};
 
 /**
  * gnutls_x509_trust_list_init:


hooks/post-receive
-- 
GNU gnutls