[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-324-gf206e15

[Nikos Mavrogiannopoulos]

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=f206e15d78ea64d60ae1716a75c7f7ad8a87a1c9

The branch, master has been updated
       via  f206e15d78ea64d60ae1716a75c7f7ad8a87a1c9 (commit)
      from  f780425c751c6e31d26985e629d1abf3886168d3 (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 f206e15d78ea64d60ae1716a75c7f7ad8a87a1c9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jul 24 16:25:28 2010 +0200

    Do not trust fbase64_decode to return 0 on success.

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

Summary of changes:
 lib/x509/privkey.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 834a8a7..7929f94 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -376,7 +376,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
       result =
        _gnutls_fbase64_decode (PEM_KEY_RSA, data->data, data->size, &out);
 
-      if (result == 0) key->pk_algorithm = GNUTLS_PK_RSA;
+      if (result >= 0) key->pk_algorithm = GNUTLS_PK_RSA;
 
       if (result == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
        {


hooks/post-receive
-- 
GNU gnutls