gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_10_0-13-gdf903


From: Simon Josefsson
Subject: [SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_10_0-13-gdf90386
Date: Sun, 25 Jul 2010 08:48:33 +0000

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

The branch, gnutls_2_10_x has been updated
       via  df9038676902b4da243e802ca34f85a40e661b22 (commit)
      from  79e34700083ea05129a2528d53dda161a04e3d27 (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 df9038676902b4da243e802ca34f85a40e661b22
Author: Simon Josefsson <address@hidden>
Date:   Sun Jul 25 10:48:29 2010 +0200

    Indent code.

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

Summary of changes:
 lib/crypto-api.c        |    6 +++---
 lib/gnutls_algorithms.c |    6 +++---
 lib/x509/privkey.c      |   11 ++++++-----
 src/certtool.c          |   14 +++++++-------
 src/cli.c               |    3 ++-
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/lib/crypto-api.c b/lib/crypto-api.c
index cad9914..183fcb3 100644
--- a/lib/crypto-api.c
+++ b/lib/crypto-api.c
@@ -114,7 +114,7 @@ void
 gnutls_cipher_deinit (gnutls_cipher_hd_t handle)
 {
   _gnutls_cipher_deinit ((cipher_hd_st *) handle);
-  gnutls_free(handle);
+  gnutls_free (handle);
 }
 
 
@@ -199,7 +199,7 @@ void
 gnutls_hmac_deinit (gnutls_hmac_hd_t handle, void *digest)
 {
   _gnutls_hmac_deinit ((digest_hd_st *) handle, digest);
-  gnutls_free(handle);
+  gnutls_free (handle);
 }
 
 /**
@@ -320,7 +320,7 @@ void
 gnutls_hash_deinit (gnutls_hash_hd_t handle, void *digest)
 {
   _gnutls_hash_deinit ((digest_hd_st *) handle, digest);
-  gnutls_free(handle);
+  gnutls_free (handle);
 }
 
 /**
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 28b786d..aacbe34 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -2122,9 +2122,9 @@ typedef struct gnutls_pk_entry gnutls_pk_entry;
 
 static const gnutls_pk_entry pk_algorithms[] = {
   {"RSA", PK_PKIX1_RSA_OID, GNUTLS_PK_RSA},
-  {"RSA (X.509)", PK_X509_RSA_OID, GNUTLS_PK_RSA}, /* some certificates use 
this OID for RSA */
-  {"RSA (MD5)", SIG_RSA_MD5_OID, GNUTLS_PK_RSA}, /* some other broken 
certificates set RSA with MD5 as an indicator of RSA */
-  {"RSA (SHA1)", SIG_RSA_SHA1_OID, GNUTLS_PK_RSA}, /* some other broken 
certificates set RSA with SHA1 as an indicator of RSA */
+  {"RSA (X.509)", PK_X509_RSA_OID, GNUTLS_PK_RSA},     /* some certificates 
use this OID for RSA */
+  {"RSA (MD5)", SIG_RSA_MD5_OID, GNUTLS_PK_RSA},       /* some other broken 
certificates set RSA with MD5 as an indicator of RSA */
+  {"RSA (SHA1)", SIG_RSA_SHA1_OID, GNUTLS_PK_RSA},     /* some other broken 
certificates set RSA with SHA1 as an indicator of RSA */
   {"DSA", PK_DSA_OID, GNUTLS_PK_DSA},
   {"GOST R 34.10-2001", PK_GOST_R3410_2001_OID, 0},
   {"GOST R 34.10-94", PK_GOST_R3410_94_OID, 0},
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index bc1c31e..4332cd8 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -358,7 +358,8 @@ 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)
        {
@@ -371,7 +372,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
              if (result == 0)
                result = GNUTLS_E_INTERNAL_ERROR;
              gnutls_assert ();
-             
+
              goto failover;
            }
 
@@ -433,9 +434,9 @@ failover:
 #ifdef ENABLE_PKI
   if (result == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
     {
-       _gnutls_debug_log("Falling back to PKCS #8 key decoding\n");
-       result = gnutls_x509_privkey_import_pkcs8 (key, data, format,
-                       NULL, GNUTLS_PKCS_PLAIN);
+      _gnutls_debug_log ("Falling back to PKCS #8 key decoding\n");
+      result = gnutls_x509_privkey_import_pkcs8 (key, data, format,
+                                                NULL, GNUTLS_PKCS_PLAIN);
     }
 #endif
 
diff --git a/src/certtool.c b/src/certtool.c
index 8d6efd2..51139ba 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -173,9 +173,10 @@ generate_private_key_int (void)
     {
       key_type = GNUTLS_PK_DSA;
       if (info.bits > 1024)
-        {
-          fprintf(stderr, "It is suggested for compatibility with other 
implementations to use DSA keys bit length 1024\n");
-        }
+       {
+         fprintf (stderr,
+                  "It is suggested for compatibility with other 
implementations to use DSA keys bit length 1024\n");
+       }
     }
   else
     key_type = GNUTLS_PK_RSA;
@@ -1540,12 +1541,11 @@ privkey_info (void)
   if (info.pkcs8 || ret == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
     {
       if (info.pass)
-        pass = info.pass;
+       pass = info.pass;
       else
-        pass = get_pass ();
+       pass = get_pass ();
       ret = gnutls_x509_privkey_import_pkcs8 (key, &pem,
-                                                 info.incert_format,
-                                                 pass, 0);
+                                             info.incert_format, pass, 0);
     }
   if (ret < 0)
     error (EXIT_FAILURE, 0, "import error: %s", gnutls_strerror (ret));
diff --git a/src/cli.c b/src/cli.c
index 5a205ff..d472883 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -512,7 +512,8 @@ init_tls_session (const char *hostname)
 
   gnutls_certificate_client_set_retrieve_function (xcred, cert_callback);
   gnutls_certificate_set_verify_function (xcred, cert_verify_callback);
-  gnutls_certificate_set_verify_flags(xcred, 
GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
+  gnutls_certificate_set_verify_flags (xcred,
+                                      GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
 
   /* send the fingerprint */
 #ifdef ENABLE_OPENPGP


hooks/post-receive
-- 
GNU gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]