[Emacs-diffs] nsm 01/01: gnutls.c windows fixups

[Lars Ingebrigtsen]

branch: nsm
commit 6fa8822893be973c475301f29cc8453557d5dd7a
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Wed Nov 19 22:03:40 2014 +0100

    gnutls.c windows fixups
    
    (fn_gnutls_sign_algorithm_get_name): Redefine two more Windows
    gnutls functions.
---
 src/ChangeLog |    2 ++
 src/gnutls.c  |   13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 6fbece5..f7f147f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * gnutls.c: Cargo-cult implementation of the Windows gnutls
        interface functions.
+       (fn_gnutls_sign_algorithm_get_name): Redefine two more Windows
+       gnutls functions.
 
 2014-11-19  Teodor Zlatanov  <address@hidden>
 
diff --git a/src/gnutls.c b/src/gnutls.c
index d097853..4c12ce4 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -183,6 +183,9 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_get_signature,
 DEF_GNUTLS_FN (int, gnutls_x509_crt_get_key_id,
               (gnutls_x509_crt_t, unsigned int,
                unsigned char *, size_t *_size));
+DEF_GNUTLS_FN (const char*, gnutls_sec_param_get_name, (gnutls_sec_param_t));
+DEF_GNUTLS_FN (const char*, gnutls_sign_algorithm_get_name,
+              (gnutls_sign_algorithm_t));
 
 static bool
 init_gnutls_functions (void)
@@ -257,6 +260,8 @@ init_gnutls_functions (void)
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_get_signature_algorithm);
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_get_signature);
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_get_key_id);
+  LOAD_GNUTLS_FN (library, gnutls_sec_param_get_name);
+  LOAD_GNUTLS_FN (library, gnutls_sign_algorithm_get_name);
 
   max_log_level = global_gnutls_log_level;
 
@@ -327,6 +332,8 @@ init_gnutls_functions (void)
 #define fn_gnutls_x509_crt_get_signature_algorithm 
gnutls_x509_crt_get_signature_algorithm
 #define fn_gnutls_x509_crt_get_signature        gnutls_x509_crt_get_signature
 #define fn_gnutls_x509_crt_get_key_id           gnutls_x509_crt_get_key_id
+#define fn_gnutls_sec_param_get_name            gnutls_sec_param_get_name
+#define fn_gnutls_sign_algorithm_get_name       gnutls_sign_algorithm_get_name
 
 #endif /* !WINDOWSNT */
 
@@ -866,8 +873,8 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
        res = nconc2 (res, list2 (intern (":public-key-algorithm"),
                                  build_string (name)));
 
-      name = gnutls_sec_param_get_name (fn_gnutls_pk_bits_to_sec_param
-                                       (err, bits));
+      name = fn_gnutls_sec_param_get_name (fn_gnutls_pk_bits_to_sec_param
+                                          (err, bits));
       res = nconc2 (res, list2 (intern (":certificate-security-level"),
                                build_string (name)));
     }
@@ -905,7 +912,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
 
     err = fn_gnutls_x509_crt_get_signature_algorithm (cert);
     if (err >= GNUTLS_E_SUCCESS) {
-      const char *name = gnutls_sign_algorithm_get_name (err);
+      const char *name = fn_gnutls_sign_algorithm_get_name (err);
       if (name)
        res = nconc2 (res, list2 (intern (":signature-algorithm"),
                                  build_string (name)));