diff --git a/cli-auth.c b/cli-auth.c
index da0d9d537ba920ea3d8cd7bf16378f5418328228..59d455be43abb9ed47bf893b573160ddf4913616 100644
--- a/cli-auth.c
+++ b/cli-auth.c
@@ -332,12 +332,12 @@ char* getpass_or_cancel(char* prompt)
 	char* password = NULL;
 	
 #ifdef DROPBEAR_PASSWORD_ENV
-    /* Password provided in an environment var */
-    password = getenv(DROPBEAR_PASSWORD_ENV);
-    if (password)
-    {
-        return password;
-    }
+	/* Password provided in an environment var */
+	password = getenv(DROPBEAR_PASSWORD_ENV);
+	if (password)
+	{
+		return password;
+	}
 #endif
 
 	password = getpass(prompt);
diff --git a/dropbearkey.c b/dropbearkey.c
index 7eb2f3f01fc77433b75e3a10e505c58436031912..0d13b38ccc786f010a1688489df2117ed26b5959 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -238,13 +238,13 @@ int main(int argc, char ** argv) {
 		}
 		
 		check_signkey_bits(keytype, bits);;
-    }
+	}
 
 	fprintf(stderr, "Generating key, this may take a while...\n");
-    if (signkey_generate(keytype, bits, filename) == DROPBEAR_FAILURE)
-    {
-    	dropbear_exit("Failed to generate key.\n");
-    }
+	if (signkey_generate(keytype, bits, filename) == DROPBEAR_FAILURE)
+	{
+		dropbear_exit("Failed to generate key.\n");
+	}
 
 	printpubfile(filename);
 
diff --git a/packet.c b/packet.c
index 19b57592f7c3fbfa3f0b5ad4e13a808b88fab326..9269e956b04bbe289cfd9508ec0fe91be6a27ca0 100644
--- a/packet.c
+++ b/packet.c
@@ -645,7 +645,7 @@ static void make_mac(unsigned int seqno, const struct key_context_directional *
 			dropbear_exit("HMAC error");
 		}
 	
-        bufsize = MAX_MAC_LEN;
+		bufsize = MAX_MAC_LEN;
 		if (hmac_done(&hmac, output_mac, &bufsize) != CRYPT_OK) {
 			dropbear_exit("HMAC error");
 		}
diff --git a/rsa.c b/rsa.c
index 193e5774b82d358936c14292758981bac69d4db3..1cedbc4f54d2fa4f809e5cc74d6e05e58eeb246e 100644
--- a/rsa.c
+++ b/rsa.c
@@ -69,12 +69,12 @@ int buf_get_rsa_pub_key(buffer* buf, dropbear_rsa_key *key) {
 	}
 
 	TRACE(("leave buf_get_rsa_pub_key: success"))
-    ret = DROPBEAR_SUCCESS;
+	ret = DROPBEAR_SUCCESS;
 out:
-    if (ret == DROPBEAR_FAILURE) {
-        m_free(key->e);
-        m_free(key->n);
-    }
+	if (ret == DROPBEAR_FAILURE) {
+		m_free(key->e);
+		m_free(key->n);
+	}
 	return ret;
 }
 
diff --git a/signkey.c b/signkey.c
index ac5d887530094a0cb23cc8d1f6325349a75a24fe..55f34e783226269f96b590adfe044b1152e61aa8 100644
--- a/signkey.c
+++ b/signkey.c
@@ -317,15 +317,15 @@ void buf_put_priv_key(buffer* buf, sign_key *key, enum signkey_type type) {
 #ifdef DROPBEAR_DSS
 	if (type == DROPBEAR_SIGNKEY_DSS) {
 		buf_put_dss_priv_key(buf, key->dsskey);
-	TRACE(("leave buf_put_priv_key: dss done"))
-	return;
+		TRACE(("leave buf_put_priv_key: dss done"))
+		return;
 	}
 #endif
 #ifdef DROPBEAR_RSA
 	if (type == DROPBEAR_SIGNKEY_RSA) {
 		buf_put_rsa_priv_key(buf, key->rsakey);
-	TRACE(("leave buf_put_priv_key: rsa done"))
-	return;
+		TRACE(("leave buf_put_priv_key: rsa done"))
+		return;
 	}
 #endif
 #ifdef DROPBEAR_ECDSA