Run Lindent on libtom(*)

1 files changed, 71 insertions, 65 deletions

diff --git a/libtomcrypt/pk/dsa/dsa_import.c b/libtomcrypt/pk/dsa/dsa_import.c
index c6a1f6f..cf21e3b 100644
--- a/libtomcrypt/pk/dsa/dsa_import.c
+++ b/libtomcrypt/pk/dsa/dsa_import.c
@@ -10,7 +10,6 @@
  */
 #include "tomcrypt.h"
 
-
 /**
    @file dsa_import.c
    DSA implementation, import a DSA key, Tom St Denis
@@ -25,73 +24,80 @@
    @param key      [out] Where to store the imported key
    @return CRYPT_OK if successful, upon error this function will free all allocated memory
 */
-int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key)
+int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key * key)
 {
-   int           err;
-   unsigned long zero = 0;
-   unsigned char* tmpbuf = NULL;
-
-   LTC_ARGCHK(in  != NULL);
-   LTC_ARGCHK(key != NULL);
-
-   /* init key */
-   if (mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL) != CRYPT_OK) {
-      return CRYPT_MEM;
-   }
-
-   /* get key type */
-   if ((err = der_decode_sequence_multi(in, inlen,
-                          LTC_ASN1_SHORT_INTEGER, 1UL, &zero, 
-                          LTC_ASN1_INTEGER,      1UL, &key->p,
-                          LTC_ASN1_INTEGER,      1UL, &key->q,
-                          LTC_ASN1_INTEGER,      1UL, &key->g,
-                          LTC_ASN1_INTEGER,      1UL, &key->y,
-                          LTC_ASN1_INTEGER,      1UL, &key->x,
-                          LTC_ASN1_EOL,          0UL, NULL)) == CRYPT_OK) {
-      key->type = PK_PRIVATE;
-   } else { /* public */
-      ltc_asn1_list params[3];
-      unsigned long tmpbuf_len = MAX_RSA_SIZE*8;
-
-      LTC_SET_ASN1(params, 0, LTC_ASN1_INTEGER, &key->p, 1UL);   
-      LTC_SET_ASN1(params, 1, LTC_ASN1_INTEGER, &key->q, 1UL);
-      LTC_SET_ASN1(params, 2, LTC_ASN1_INTEGER, &key->g, 1UL);
-
-      tmpbuf = XCALLOC(1, tmpbuf_len);
-      if (tmpbuf == NULL) {
-          err = CRYPT_MEM;
-          goto LBL_ERR;
-      }
-
-      err = der_decode_subject_public_key_info(in, inlen,
-        PKA_DSA, tmpbuf, &tmpbuf_len,
-        LTC_ASN1_SEQUENCE, params, 3);
-      if (err != CRYPT_OK) {
-         goto LBL_ERR;
-      }
-
-      if ((err=der_decode_integer(tmpbuf, tmpbuf_len, &key->y)) != CRYPT_OK) {
-         goto LBL_ERR;
-      }
-      
-      XFREE(tmpbuf);
-      key->type = PK_PUBLIC;
-  }
-
-  key->qord = mp_unsigned_bin_size(&key->q);
-
-  if (key->qord >= LTC_MDSA_MAX_GROUP || key->qord <= 15 ||
-      (unsigned long)key->qord >= mp_unsigned_bin_size(&key->p) || (mp_unsigned_bin_size(&key->p) - key->qord) >= LTC_MDSA_DELTA) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-
-  return CRYPT_OK;
+	int err;
+	unsigned long zero = 0;
+	unsigned char *tmpbuf = NULL;
+
+	LTC_ARGCHK(in != NULL);
+	LTC_ARGCHK(key != NULL);
+
+	/* init key */
+	if (mp_init_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL) !=
+	    CRYPT_OK) {
+		return CRYPT_MEM;
+	}
+
+	/* get key type */
+	if ((err = der_decode_sequence_multi(in, inlen,
+					     LTC_ASN1_SHORT_INTEGER, 1UL, &zero,
+					     LTC_ASN1_INTEGER, 1UL, &key->p,
+					     LTC_ASN1_INTEGER, 1UL, &key->q,
+					     LTC_ASN1_INTEGER, 1UL, &key->g,
+					     LTC_ASN1_INTEGER, 1UL, &key->y,
+					     LTC_ASN1_INTEGER, 1UL, &key->x,
+					     LTC_ASN1_EOL, 0UL,
+					     NULL)) == CRYPT_OK) {
+		key->type = PK_PRIVATE;
+	} else {		/* public */
+		ltc_asn1_list params[3];
+		unsigned long tmpbuf_len = MAX_RSA_SIZE * 8;
+
+		LTC_SET_ASN1(params, 0, LTC_ASN1_INTEGER, &key->p, 1UL);
+		LTC_SET_ASN1(params, 1, LTC_ASN1_INTEGER, &key->q, 1UL);
+		LTC_SET_ASN1(params, 2, LTC_ASN1_INTEGER, &key->g, 1UL);
+
+		tmpbuf = XCALLOC(1, tmpbuf_len);
+		if (tmpbuf == NULL) {
+			err = CRYPT_MEM;
+			goto LBL_ERR;
+		}
+
+		err = der_decode_subject_public_key_info(in, inlen,
+							 PKA_DSA, tmpbuf,
+							 &tmpbuf_len,
+							 LTC_ASN1_SEQUENCE,
+							 params, 3);
+		if (err != CRYPT_OK) {
+			goto LBL_ERR;
+		}
+
+		if ((err =
+		     der_decode_integer(tmpbuf, tmpbuf_len,
+					&key->y)) != CRYPT_OK) {
+			goto LBL_ERR;
+		}
+
+		XFREE(tmpbuf);
+		key->type = PK_PUBLIC;
+	}
+
+	key->qord = mp_unsigned_bin_size(&key->q);
+
+	if (key->qord >= LTC_MDSA_MAX_GROUP || key->qord <= 15 ||
+	    (unsigned long)key->qord >= mp_unsigned_bin_size(&key->p)
+	    || (mp_unsigned_bin_size(&key->p) - key->qord) >= LTC_MDSA_DELTA) {
+		err = CRYPT_INVALID_PACKET;
+		goto LBL_ERR;
+	}
+
+	return CRYPT_OK;
 
 LBL_ERR:
-   XFREE(tmpbuf);
-   mp_clear_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
-   return err;
+	XFREE(tmpbuf);
+	mp_clear_multi(&key->p, &key->g, &key->q, &key->x, &key->y, NULL);
+	return err;
 }
 
 #endif