Code cleanup; Move some functions to smallFunctions.go file

Author: darsh12

functions/cli.go

@@ -5,9 +5,7 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 	"fmt"
-	"log"
 	"os"
-	"strings"
 )
 
 //Function to create a user option interface for encryption purposes
@@ -65,10 +63,3 @@ func Ui() (encryption Parameters, meta Metadata) {
 
 	return encryption, meta
 }
-
-func CheckEmptyString(str string) {
-	if strings.TrimSpace(str) == "" {
-		log.Fatal("empty input")
-		os.Exit(1)
-	}
-}

functions/pbkdf.go

@@ -2,20 +2,17 @@ package helper
 
 import (
 	"bufio"
-	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/des"
 	"crypto/hmac"
 	"crypto/rand"
 	"crypto/sha256"
 	"crypto/sha512"
-	"encoding/base64"
 	"errors"
 	"golang.org/x/crypto/pbkdf2"
 	"hash"
 	"io"
-	"log"
 	"os"
 	"strings"
 )
@@ -130,16 +127,6 @@ func Encryption(password string, plainText string, cli Parameters, meta Metadata
 
 }
 
-func encodeBase64(input []byte) string {
-	return base64.StdEncoding.EncodeToString(input)
-}
-
-func DecodeBase64(input string) []byte {
-	str, err := base64.StdEncoding.DecodeString(input)
-	CheckError(err)
-	return str
-}
-
 /*
 This function will take in the encrypted file path and the password from the user.
 The rest of the parameters required for decryptio, will be extracted from the metadata, written during the encryption process
@@ -258,40 +245,3 @@ func Decryption(file string, password string) (text string, err error) {
 
 	return string(unpadText), err
 }
-
-//Function to check errors, to prevent a lot if statements in-code
-func CheckError(err error) {
-	if err != nil {
-		log.Fatal(err)
-		//panic(err)
-	}
-}
-
-//Function to pad the data and figure out the block size by repeating the bytes
-func Pad(src []byte, algorithm string) []byte {
-	var padding int
-
-	if (algorithm == "aes128") || algorithm == "aes256" {
-		padding = aes.BlockSize - len(src)%aes.BlockSize
-	} else if algorithm == "3des" {
-		padding = des.BlockSize - len(src)%des.BlockSize
-	} else {
-		err := errors.New("invalid encryption choice")
-		CheckError(err)
-	}
-
-	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
-	return append(src, padtext...)
-}
-
-//Function to unpad the data
-func Unpad(src []byte) ([]byte, error) {
-	length := len(src)
-	unpadding := int(src[length-1])
-
-	if unpadding > length {
-		return nil, errors.New("un-padding error. ")
-	}
-
-	return src[:(length - unpadding)], nil
-}

functions/smallFunctions.go

@@ -0,0 +1,66 @@
+package helper
+
+import (
+	"bytes"
+	"crypto/aes"
+	"crypto/des"
+	"encoding/base64"
+	"errors"
+	"log"
+	"os"
+	"strings"
+)
+
+//Function to check errors, to prevent a lot if statements in-code
+func CheckError(err error) {
+	if err != nil {
+		log.Fatal(err)
+		//panic(err)
+	}
+}
+
+//Function to pad the data and figure out the block size by repeating the bytes
+func Pad(src []byte, algorithm string) []byte {
+	var padding int
+
+	if (algorithm == "aes128") || algorithm == "aes256" {
+		padding = aes.BlockSize - len(src)%aes.BlockSize
+	} else if algorithm == "3des" {
+		padding = des.BlockSize - len(src)%des.BlockSize
+	} else {
+		err := errors.New("invalid encryption choice")
+		CheckError(err)
+	}
+
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(src, padtext...)
+}
+
+//Function to unpad the data
+func Unpad(src []byte) ([]byte, error) {
+	length := len(src)
+	unpadding := int(src[length-1])
+
+	if unpadding > length {
+		return nil, errors.New("un-padding error. ")
+	}
+
+	return src[:(length - unpadding)], nil
+}
+
+func encodeBase64(input []byte) string {
+	return base64.StdEncoding.EncodeToString(input)
+}
+
+func DecodeBase64(input string) []byte {
+	str, err := base64.StdEncoding.DecodeString(input)
+	CheckError(err)
+	return str
+}
+
+func CheckEmptyString(str string) {
+	if strings.TrimSpace(str) == "" {
+		log.Fatal("empty input")
+		os.Exit(1)
+	}
+}