diff options
| author | Nikos <nmav@crystal.(none)> | 2008-03-29 12:02:47 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2008-03-29 12:02:47 +0200 |
| commit | 38df2b42fd5bf934115c9d78d366109c97ab1cc7 (patch) | |
| tree | bbf0884d829c357675926fcf26ca99243a67778d /includes | |
| parent | 0b37eef0f6b6626d5e4b5936bbc6f012416ef61a (diff) | |
| parent | 42cbcc16110d8ad3fba27b57426fa4c435b54537 (diff) | |
| download | gnutls-38df2b42fd5bf934115c9d78d366109c97ab1cc7.tar.gz | |
Merge branch 'master' of ssh://nmav@git.sv.gnu.org/srv/git/gnutls
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Makefile.am | 4 | ||||
| -rw-r--r-- | includes/gnutls/gnutls.h.in | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/includes/Makefile.am b/includes/Makefile.am index ab74ad5934..a9ef64a9d2 100644 --- a/includes/Makefile.am +++ b/includes/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation # # Author: Nikos Mavroyanopoulos # @@ -20,7 +20,7 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. nobase_include_HEADERS = gnutls/extra.h gnutls/x509.h gnutls/pkcs12.h \ - gnutls/compat.h gnutls/openpgp.h + gnutls/compat.h gnutls/openpgp.h gnutls/crypto.h if ENABLE_OPENSSL nobase_include_HEADERS += gnutls/openssl.h diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in index 0292ab7cc0..eb7f8a7a27 100644 --- a/includes/gnutls/gnutls.h.in +++ b/includes/gnutls/gnutls.h.in @@ -126,6 +126,8 @@ extern "C" GNUTLS_MAC_SHA256, GNUTLS_MAC_SHA384, GNUTLS_MAC_SHA512 + /* If you add anything here, make sure you align with + gnutls_digest_algorithm_t, in particular SHA-224. */ } gnutls_mac_algorithm_t; /* The enumerations here should have the same value with @@ -140,7 +142,8 @@ extern "C" GNUTLS_DIG_MD2 = GNUTLS_MAC_MD2, GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256, GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384, - GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512 + GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512, + GNUTLS_DIG_SHA224 } gnutls_digest_algorithm_t; /* exported for other gnutls headers. This is the maximum number of @@ -308,7 +311,8 @@ extern "C" GNUTLS_SIGN_RSA_RMD160, GNUTLS_SIGN_RSA_SHA256, GNUTLS_SIGN_RSA_SHA384, - GNUTLS_SIGN_RSA_SHA512 + GNUTLS_SIGN_RSA_SHA512, + GNUTLS_SIGN_RSA_SHA224 } gnutls_sign_algorithm_t; const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t |