guile: Add 'GNUTLS_DIG_SHA256' enum value.

* guile/modules/gnutls/build/enums.scm (%digest-enum): Add 'sha256'.
* guile/modules/gnutls.in: Export 'digest/sha256'.
* guile/tests/x509-certificates.scm: Test 'digest/sha256' with
'x509-certificate-fingerprint'.
(%sha256-fingerprint): New constant.

Signed-off-by: Simon South <simon@simonsouth.net>

diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in
index 56b4068e071483ce5d49ffb94019609481c2e8ae..03951962738490b8f0be5296ab4c2e4c73035005 100644 (file)
--- a/guile/modules/gnutls.in
+++ b/guile/modules/gnutls.in
@@ -153,6 +153,7 @@
            digest/sha1
            digest/rmd160
            digest/md2
+           digest/sha256
            compression-method/null
            compression-method/deflate
            compression-method/lzo

diff --git a/guile/modules/gnutls/build/enums.scm b/guile/modules/gnutls/build/enums.scm
index 117059b0e39799eddcd9661fb1d06d9364f52dd4..4bfbb4554907dc292f75b91133970ef9e0957931 100644 (file)
--- a/guile/modules/gnutls/build/enums.scm
+++ b/guile/modules/gnutls/build/enums.scm
@@ -325,7 +325,7 @@
 
 (define %digest-enum
   (make-enum-type 'digest "gnutls_digest_algorithm_t"
-                  '(null md5 sha1 rmd160 md2)
+                  '(null md5 sha1 rmd160 md2 sha256)
                   #f
                   "GNUTLS_DIG_"))
 

diff --git a/guile/tests/x509-certificates.scm b/guile/tests/x509-certificates.scm
index 984ec6fe3b26165fad015332bcf0bea0f28b6614..874c8ac5ea5977b988b4f7c9caf621db6b88c930 100644 (file)
--- a/guile/tests/x509-certificates.scm
+++ b/guile/tests/x509-certificates.scm
@@ -46,6 +46,10 @@
   ;; The certificate's SHA-1 fingerprint.
   "7c55df47de718869d55998ee1e9301331ccd0601")
 
+(define %sha256-fingerprint
+  ;; The certificate's SHA-256 fingerprint.
+  "0db40a5ee20169d25f090e4d165d87266b1a04722cddec4da36692c81c3096f6")
+
 
 (define (file-size file)
   (stat:size (stat file)))
@@ -87,6 +91,9 @@
                        (x509-subject-alternative-name->string type))))
                (equal? (u8vector->hex-string
                         (x509-certificate-fingerprint cert digest/sha1))
-                       %sha1-fingerprint))))))
+                       %sha1-fingerprint)
+               (equal? (u8vector->hex-string
+                        (x509-certificate-fingerprint cert digest/sha256))
+                       %sha256-fingerprint))))))
 
 ;;; arch-tag: eef09b52-30e8-472a-8b93-cb636434f6eb