Clean out tabs

2 files changed, 58 insertions, 58 deletions

diff --git a/src/main/java/se/lublin/humla/net/HumlaCertificateGenerator.java b/src/main/java/se/lublin/humla/net/HumlaCertificateGenerator.java
index a7996c9..23e4a9c 100644
--- a/src/main/java/se/lublin/humla/net/HumlaCertificateGenerator.java
+++ b/src/main/java/se/lublin/humla/net/HumlaCertificateGenerator.java
@@ -43,40 +43,40 @@ import java.util.Calendar;
 import java.util.Date;
 
 public class HumlaCertificateGenerator {
-	private static final String ISSUER = "CN=Humla Client";
-	private static final Integer YEARS_VALID = 20;
+    private static final String ISSUER = "CN=Humla Client";
+    private static final Integer YEARS_VALID = 20;
 
-	public static X509Certificate generateCertificate(OutputStream output) throws NoSuchAlgorithmException, OperatorCreationException, CertificateException, KeyStoreException, NoSuchProviderException, IOException {
-		BouncyCastleProvider provider = new BouncyCastleProvider(); // Use SpongyCastle provider, supports creating X509 certs
-		KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
-		generator.initialize(2048, new SecureRandom());
-		
-		KeyPair keyPair = generator.generateKeyPair();
-		
-		SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded());
-		ContentSigner signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(provider).build(keyPair.getPrivate());
-		
-		Date startDate = new Date();
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(startDate);
-		calendar.add(Calendar.YEAR, YEARS_VALID);
-	    Date endDate = calendar.getTime();
-		
-		X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(new X500Name(ISSUER),
-				BigInteger.ONE, 
-				startDate, endDate, new X500Name(ISSUER),
-				publicKeyInfo);
+    public static X509Certificate generateCertificate(OutputStream output) throws NoSuchAlgorithmException, OperatorCreationException, CertificateException, KeyStoreException, NoSuchProviderException, IOException {
+        BouncyCastleProvider provider = new BouncyCastleProvider(); // Use SpongyCastle provider, supports creating X509 certs
+        KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
+        generator.initialize(2048, new SecureRandom());
 
-		X509CertificateHolder certificateHolder = certBuilder.build(signer);
-		
-		X509Certificate certificate = new JcaX509CertificateConverter().setProvider(provider).getCertificate(certificateHolder);
-		
-		KeyStore keyStore = KeyStore.getInstance("PKCS12", provider);
-		keyStore.load(null, null);
-		keyStore.setKeyEntry("Humla Key", keyPair.getPrivate(), null, new X509Certificate[] { certificate });
-		
-		keyStore.store(output, "".toCharArray());
-		
-		return certificate;
-	}
+        KeyPair keyPair = generator.generateKeyPair();
+
+        SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded());
+        ContentSigner signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(provider).build(keyPair.getPrivate());
+
+        Date startDate = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        calendar.add(Calendar.YEAR, YEARS_VALID);
+        Date endDate = calendar.getTime();
+
+        X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(new X500Name(ISSUER),
+                BigInteger.ONE,
+                startDate, endDate, new X500Name(ISSUER),
+                publicKeyInfo);
+
+        X509CertificateHolder certificateHolder = certBuilder.build(signer);
+
+        X509Certificate certificate = new JcaX509CertificateConverter().setProvider(provider).getCertificate(certificateHolder);
+
+        KeyStore keyStore = KeyStore.getInstance("PKCS12", provider);
+        keyStore.load(null, null);
+        keyStore.setKeyEntry("Humla Key", keyPair.getPrivate(), null, new X509Certificate[] { certificate });
+
+        keyStore.store(output, "".toCharArray());
+
+        return certificate;
+    }
 }
diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
index 9bb512d..36c331b 100644
--- a/src/main/jni/Android.mk
+++ b/src/main/jni/Android.mk
@@ -21,49 +21,49 @@ include $(CLEAR_VARS)
 LOCAL_PATH          := $(ROOT)/speex/libspeex
 LOCAL_MODULE        := jnispeex
 LOCAL_C_INCLUDES    := $(ROOT)/speex/include/
-LOCAL_SRC_FILES		:= cb_search.c		exc_10_32_table.c 	exc_8_128_table.c 	filters.c \
-					   gain_table.c 	hexc_table.c 		high_lsp_tables.c 	lsp.c \
-					   ltp.c			speex.c 			stereo.c 			vbr.c \
-					   vq.c bits.c 		exc_10_16_table.c	exc_20_32_table.c 	exc_5_256_table.c \
-					   exc_5_64_table.c	gain_table_lbr.c 	hexc_10_32_table.c	lpc.c \
-					   lsp_tables_nb.c 	modes.c 			modes_wb.c 			nb_celp.c \
-					   quant_lsp.c		sb_celp.c			speex_callbacks.c 	speex_header.c \
-					   window.c			resample.c			jitter.c            preprocess.c \
-					   mdf.c            kiss_fft.c          kiss_fftr.c         fftwrap.c \
-					   filterbank.c     scal.c \
-					   $(ROOT)/jnispeex.cpp
-LOCAL_CFLAGS		:= -D__EMX__ -DUSE_KISS_FFT -DFIXED_POINT -DEXPORT=''
+LOCAL_SRC_FILES     := cb_search.c      exc_10_32_table.c   exc_8_128_table.c   filters.c \
+                       gain_table.c     hexc_table.c        high_lsp_tables.c   lsp.c \
+                       ltp.c            speex.c             stereo.c            vbr.c \
+                       vq.c bits.c      exc_10_16_table.c   exc_20_32_table.c   exc_5_256_table.c \
+                       exc_5_64_table.c gain_table_lbr.c    hexc_10_32_table.c  lpc.c \
+                       lsp_tables_nb.c  modes.c             modes_wb.c          nb_celp.c \
+                       quant_lsp.c      sb_celp.c           speex_callbacks.c   speex_header.c \
+                       window.c         resample.c          jitter.c            preprocess.c \
+                       mdf.c            kiss_fft.c          kiss_fftr.c         fftwrap.c \
+                       filterbank.c     scal.c \
+                       $(ROOT)/jnispeex.cpp
+LOCAL_CFLAGS           := -D__EMX__ -DUSE_KISS_FFT -DFIXED_POINT -DEXPORT=''
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_PATH			:= $(ROOT)/celt-0.11.0-src/libcelt
-LOCAL_MODULE		:= jnicelt11
-LOCAL_SRC_FILES		:= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c \
+LOCAL_PATH          := $(ROOT)/celt-0.11.0-src/libcelt
+LOCAL_MODULE        := jnicelt11
+LOCAL_SRC_FILES     := bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c \
                        laplace.c mathops.c mdct.c modes.c pitch.c plc.c quant_bands.c rate.c vq.c \
                        $(ROOT)/jnicelt11.cpp
 LOCAL_C_INCLUDES    := $(ROOT)/celt-0.11.0-src/libcelt/
-LOCAL_CFLAGS		:= -I$(ROOT)/celt-0.11.0-build -DHAVE_CONFIG_H -fvisibility=hidden
+LOCAL_CFLAGS        := -I$(ROOT)/celt-0.11.0-build -DHAVE_CONFIG_H -fvisibility=hidden
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_PATH			:= $(ROOT)/celt-0.7.0-src/libcelt
-LOCAL_MODULE		:= jnicelt7
-LOCAL_SRC_FILES		:= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c \
+LOCAL_PATH          := $(ROOT)/celt-0.7.0-src/libcelt
+LOCAL_MODULE        := jnicelt7
+LOCAL_SRC_FILES     := bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c \
                        kiss_fftr.c laplace.c mdct.c modes.c pitch.c psy.c quant_bands.c rangedec.c \
                        rangeenc.c rate.c vq.c $(ROOT)/jnicelt7.cpp
 LOCAL_C_INCLUDES    := $(ROOT)/celt-0.7.0-src/libcelt/
-LOCAL_CFLAGS		:= -I$(ROOT)/celt-0.7.0-build -DHAVE_CONFIG_H -fvisibility=hidden
+LOCAL_CFLAGS        := -I$(ROOT)/celt-0.7.0-build -DHAVE_CONFIG_H -fvisibility=hidden
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_PATH			:= $(ROOT)/opus
-LOCAL_MODULE		:= jniopus
+LOCAL_PATH   := $(ROOT)/opus
+LOCAL_MODULE := jniopus
 
 include $(LOCAL_PATH)/celt_sources.mk
 include $(LOCAL_PATH)/silk_sources.mk
@@ -79,10 +79,10 @@ SILK_SOURCES += $(SILK_SOURCES_FIXED)
 OPUS_SOURCES += $(OPUS_SOURCES_FLOAT)
 # end fixed point
 
-LOCAL_C_INCLUDES	:= $(LOCAL_PATH)/include $(LOCAL_PATH)/celt $(LOCAL_PATH)/silk \
+LOCAL_C_INCLUDES    := $(LOCAL_PATH)/include $(LOCAL_PATH)/celt $(LOCAL_PATH)/silk \
                        $(LOCAL_PATH)/silk/float $(LOCAL_PATH)/silk/fixed
 LOCAL_SRC_FILES     := $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES) $(ROOT)/jniopus.cpp
-LOCAL_CFLAGS		:= -DOPUS_BUILD -DVAR_ARRAYS -DFIXED_POINT
+LOCAL_CFLAGS        := -DOPUS_BUILD -DVAR_ARRAYS -DFIXED_POINT
 LOCAL_CPP_FEATURES  := exceptions
 LOCAL_LDLIBS        := -llog
 include $(BUILD_SHARED_LIBRARY)