From eeeab4239843e716b3fd4dd259985a4cd4c487a5 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 18 Feb 2015 16:40:01 +0100 Subject: [PATCH] gcrypt: Some trivial fixes. Some whitespace issues, but also a typo and two instances of superfluous parentheses. --- gcrypt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gcrypt.c b/gcrypt.c index 62b95def..ad38dcb8 100644 --- a/gcrypt.c +++ b/gcrypt.c @@ -87,7 +87,7 @@ void init_random_seed_or_die(void) } /** S-expression for the public part of an RSA key. */ -#define RSA_PUBKEY_SEXP "(public-key (rsa (n %m) (e %m)))" +#define RSA_PUBKEY_SEXP "(public-key (rsa (n %m) (e %m)))" /** S-expression for a private RSA key. */ #define RSA_PRIVKEY_SEXP "(private-key (rsa (n %m) (e %m) (d %m) (p %m) (q %m) (u %m)))" @@ -239,7 +239,6 @@ static int decode_key(const char *key_file, const char *header_str, key[j++] = begin[i]; } key[j] = '\0'; - //PARA_CRIT_LOG("key: %s\n", key); blob_size = key_size * 2; blob = para_malloc(blob_size); ret = base64_decode(key, blob, blob_size); @@ -275,14 +274,14 @@ enum asn1_types { /* bit 6 has value 0 */ static inline bool is_primitive(unsigned char c) { - return ((c & (1<<6)) == 0); + return (c & (1<<6)) == 0; } static inline bool is_primitive_integer(unsigned char c) { if (!is_primitive(c)) return false; - return ((c & 0x1f) == ASN1_TYPE_INTEGER); + return (c & 0x1f) == ASN1_TYPE_INTEGER; } /* Bit 8 is zero (and bits 7-1 give the length) */ @@ -305,7 +304,7 @@ static int find_pubkey_bignum_offset(const unsigned char *data, int len) { const unsigned char *p = data, *end = data + len; - /* the whole thing istarts with one sequence */ + /* the whole thing starts with one sequence */ if (*p != ASN1_TYPE_SEQUENCE) return -E_ASN1_PARSE; p++; @@ -429,7 +428,7 @@ static int find_privkey_bignum_offset(const unsigned char *data, int len) if (p >= end) return -E_ASN1_PARSE; - /* Skip next integer */ + /* skip next integer */ if (*p != ASN1_TYPE_INTEGER) return -E_ASN1_PARSE; p++; @@ -604,7 +603,7 @@ static int get_ssh_public_key(unsigned char *data, int size, gcry_sexp_t *result size_t nr_scanned, erroff, decoded_size; gcry_mpi_t e = NULL, n = NULL; - PARA_DEBUG_LOG("decoding %d byte public rsa-ssh key\n", size); + PARA_DEBUG_LOG("decoding %d byte public rsa-ssh key\n", size); if (size > INT_MAX / 4) return -ERRNO_TO_PARA_ERROR(EOVERFLOW); blob = para_malloc(2 * size); -- 2.39.5