From 431d6bc3c74fd4452d99819d877c923a0065f99c Mon Sep 17 00:00:00 2001 From: Raghavendra Balgi Date: Wed, 22 Apr 2020 16:50:38 +0530 Subject: [PATCH] Module changes --- cmd/echoserver/echo_server.go | 2 +- cmd/iso_host/iso_host.go | 6 +++--- cmd/netcat/netcat.go | 2 +- cmd/scratchpad/scratchpad.go | 4 ++-- cmd/thales_hsm/thales_hsm.go | 4 ++-- cmd/thales_hsm_client/thales_hsm_client.go | 2 +- crypto/mac/x99_mac.go | 2 +- crypto/mac/x9x_mac_test.go | 2 +- crypto/pin/crypto_pin.go | 10 ++-------- hsm/console/console.go | 2 +- hsm/hsm.go | 3 +-- hsm/hsm_key_functions.go | 2 +- hsm/hsm_key_functions_x917.go | 2 +- hsm/thales_a0_command.go | 4 ++-- hsm/thales_cc_command_test.go | 2 +- hsm/thales_ms_command.go | 2 +- hsm/thales_ms_command_test.go | 2 +- hsm/thales_nc_command_test.go | 2 +- hsm/thales_pin_handler.go | 2 +- iso8583/iso8583_field_data.go | 2 +- iso8583/iso8583_variable_field.go | 2 +- iso8583/services/iso8583_json_services.go | 2 +- iso_host/iso8583_auth_req_handler.go | 2 +- iso_host/iso8583_network_req_handler.go | 2 +- iso_host/iso8583_reversal_req_handler.go | 2 +- iso_host/iso_host_handler.go | 2 +- 26 files changed, 32 insertions(+), 39 deletions(-) diff --git a/cmd/echoserver/echo_server.go b/cmd/echoserver/echo_server.go index 2a79f23..27535df 100644 --- a/cmd/echoserver/echo_server.go +++ b/cmd/echoserver/echo_server.go @@ -2,7 +2,7 @@ package main import ( "fmt" - mynet "libiso/net" + mynet "github.com/rkbalgi/libiso/net" "log" "net" //"testing" diff --git a/cmd/iso_host/iso_host.go b/cmd/iso_host/iso_host.go index 885468f..8914364 100644 --- a/cmd/iso_host/iso_host.go +++ b/cmd/iso_host/iso_host.go @@ -6,9 +6,9 @@ import ( "encoding/hex" "flag" "fmt" - "libiso/iso8583" - "libiso/iso_host" - bnet "libiso/net" + "github.com/rkbalgi/libiso/iso8583" + "github.com/rkbalgi/libiso/iso_host" + bnet "github.com/rkbalgi/libiso/net" "log" "net" "os" diff --git a/cmd/netcat/netcat.go b/cmd/netcat/netcat.go index 966c5c9..3a706d1 100644 --- a/cmd/netcat/netcat.go +++ b/cmd/netcat/netcat.go @@ -1,7 +1,7 @@ package main import ( - mynet "libiso/net" + mynet "github.com/rkbalgi/libiso/net" "log" ) import ( diff --git a/cmd/scratchpad/scratchpad.go b/cmd/scratchpad/scratchpad.go index a6834b3..efd1bac 100644 --- a/cmd/scratchpad/scratchpad.go +++ b/cmd/scratchpad/scratchpad.go @@ -1,12 +1,12 @@ package main //import hexutils "github.com/rkbalgi/utils" -import "libiso/crypto" +import "github.com/rkbalgi/libiso/crypto" import ( "bytes" "encoding/hex" "fmt" - "libiso/utils" + "github.com/rkbalgi/libiso/utils" "reflect" "sync" //"os" diff --git a/cmd/thales_hsm/thales_hsm.go b/cmd/thales_hsm/thales_hsm.go index 142e176..3509fd4 100644 --- a/cmd/thales_hsm/thales_hsm.go +++ b/cmd/thales_hsm/thales_hsm.go @@ -1,8 +1,8 @@ package main import ( - _ "libiso/hsm" - "libiso/hsm/console" + _ "github.com/rkbalgi/libiso/hsm" + "github.com/rkbalgi/libiso/hsm/console" "sync" ) diff --git a/cmd/thales_hsm_client/thales_hsm_client.go b/cmd/thales_hsm_client/thales_hsm_client.go index 9e613cb..168bbc2 100644 --- a/cmd/thales_hsm_client/thales_hsm_client.go +++ b/cmd/thales_hsm_client/thales_hsm_client.go @@ -3,7 +3,7 @@ package main import ( "encoding/hex" "fmt" - "libiso/net" + "github.com/rkbalgi/libiso/net" "os" "time" ) diff --git a/crypto/mac/x99_mac.go b/crypto/mac/x99_mac.go index 176a82e..8fab9ca 100644 --- a/crypto/mac/x99_mac.go +++ b/crypto/mac/x99_mac.go @@ -5,7 +5,7 @@ package mac import ( "encoding/hex" - "libiso/crypto" + "github.com/rkbalgi/libiso/crypto" ) //generate a X9.9 MAC using a single length key diff --git a/crypto/mac/x9x_mac_test.go b/crypto/mac/x9x_mac_test.go index 33c2eab..6a9dca5 100644 --- a/crypto/mac/x9x_mac_test.go +++ b/crypto/mac/x9x_mac_test.go @@ -2,7 +2,7 @@ package mac import ( "bytes" - "libiso/utils" + "github.com/rkbalgi/libiso/utils" "testing" ) diff --git a/crypto/pin/crypto_pin.go b/crypto/pin/crypto_pin.go index 4b8807d..987eec5 100644 --- a/crypto/pin/crypto_pin.go +++ b/crypto/pin/crypto_pin.go @@ -6,15 +6,9 @@ package pin import ( "bytes" - "encoding/hex" - _ "fmt" - _ "log" - _ "strconv" - _ "strings" - //"math" "crypto/rand" - _crypt "libiso/crypto" - //"github.com/rkbalgi/crypto/pin" + "encoding/hex" + _crypt "github.com/rkbalgi/libiso/crypto" ) type PinBlocker interface { diff --git a/hsm/console/console.go b/hsm/console/console.go index b753390..6119bbe 100644 --- a/hsm/console/console.go +++ b/hsm/console/console.go @@ -3,7 +3,7 @@ package console import ( "bufio" "fmt" - "libiso/hsm" + "github.com/rkbalgi/libiso/hsm" //"io" _ "flag" "os" diff --git a/hsm/hsm.go b/hsm/hsm.go index e7d7c94..fd94efd 100644 --- a/hsm/hsm.go +++ b/hsm/hsm.go @@ -7,11 +7,10 @@ import ( //"bytes" "encoding/binary" "encoding/hex" + _net "github.com/rkbalgi/libiso/net" "io" - _net "libiso/net" "log" "os" - _ "strconv" "strings" "time" ) diff --git a/hsm/hsm_key_functions.go b/hsm/hsm_key_functions.go index 3236ff2..bcb78cb 100644 --- a/hsm/hsm_key_functions.go +++ b/hsm/hsm_key_functions.go @@ -2,8 +2,8 @@ package hsm import ( "encoding/hex" + "github.com/rkbalgi/libiso/crypto" "golang.org/x/xerrors" - "libiso/crypto" "strconv" ) diff --git a/hsm/hsm_key_functions_x917.go b/hsm/hsm_key_functions_x917.go index db300ad..9d41e7f 100644 --- a/hsm/hsm_key_functions_x917.go +++ b/hsm/hsm_key_functions_x917.go @@ -1,7 +1,7 @@ package hsm import ( - "libiso/crypto" + "github.com/rkbalgi/libiso/crypto" ) //encrypt a key under the kek using x917 diff --git a/hsm/thales_a0_command.go b/hsm/thales_a0_command.go index 80e9c39..ffbf494 100644 --- a/hsm/thales_a0_command.go +++ b/hsm/thales_a0_command.go @@ -3,8 +3,8 @@ package hsm import ( "bytes" "encoding/hex" - "libiso/crypto" - "libiso/hsm/keys" + "github.com/rkbalgi/libiso/crypto" + "github.com/rkbalgi/libiso/hsm/keys" ) type thalesA0Req struct { diff --git a/hsm/thales_cc_command_test.go b/hsm/thales_cc_command_test.go index ddd1b62..dda75f2 100644 --- a/hsm/thales_cc_command_test.go +++ b/hsm/thales_cc_command_test.go @@ -3,7 +3,7 @@ package hsm import ( "encoding/hex" "fmt" - "libiso/net" + "github.com/rkbalgi/libiso/net" "strings" "testing" ) diff --git a/hsm/thales_ms_command.go b/hsm/thales_ms_command.go index 8e1fb88..246708b 100644 --- a/hsm/thales_ms_command.go +++ b/hsm/thales_ms_command.go @@ -3,7 +3,7 @@ package hsm import ( "bytes" "encoding/hex" - "libiso/crypto/mac" + "github.com/rkbalgi/libiso/crypto/mac" "log" //_ "github.com/rkbalgi/hsm" ) diff --git a/hsm/thales_ms_command_test.go b/hsm/thales_ms_command_test.go index 454ac78..8e3e290 100644 --- a/hsm/thales_ms_command_test.go +++ b/hsm/thales_ms_command_test.go @@ -4,7 +4,7 @@ import ( //"bytes" "encoding/hex" "fmt" - "libiso/net" + "github.com/rkbalgi/libiso/net" "strings" "testing" ) diff --git a/hsm/thales_nc_command_test.go b/hsm/thales_nc_command_test.go index 2679fc7..bbed95c 100644 --- a/hsm/thales_nc_command_test.go +++ b/hsm/thales_nc_command_test.go @@ -3,7 +3,7 @@ package hsm import ( "encoding/hex" "fmt" - "libiso/net" + "github.com/rkbalgi/libiso/net" "strings" "testing" ) diff --git a/hsm/thales_pin_handler.go b/hsm/thales_pin_handler.go index b93ccc2..b57db2b 100644 --- a/hsm/thales_pin_handler.go +++ b/hsm/thales_pin_handler.go @@ -2,7 +2,7 @@ package hsm import ( "fmt" - "libiso/crypto/pin" + "github.com/rkbalgi/libiso/crypto/pin" "log" ) diff --git a/iso8583/iso8583_field_data.go b/iso8583/iso8583_field_data.go index 2a9ee39..e1c07fc 100644 --- a/iso8583/iso8583_field_data.go +++ b/iso8583/iso8583_field_data.go @@ -3,7 +3,7 @@ package iso8583 import ( "encoding/hex" _ "fmt" - "libiso/encoding/ebcdic" + "github.com/rkbalgi/libiso/encoding/ebcdic" "log" ) diff --git a/iso8583/iso8583_variable_field.go b/iso8583/iso8583_variable_field.go index d39d84a..2cc54fa 100644 --- a/iso8583/iso8583_variable_field.go +++ b/iso8583/iso8583_variable_field.go @@ -6,7 +6,7 @@ import ( _ "encoding/binary" "encoding/hex" "fmt" - "libiso/encoding/ebcdic" + "github.com/rkbalgi/libiso/encoding/ebcdic" "strconv" ) diff --git a/iso8583/services/iso8583_json_services.go b/iso8583/services/iso8583_json_services.go index ffef5b2..57e31bc 100644 --- a/iso8583/services/iso8583_json_services.go +++ b/iso8583/services/iso8583_json_services.go @@ -2,7 +2,7 @@ package services import ( "encoding/json" - "libiso/iso8583" + "github.com/rkbalgi/libiso/iso8583" "log" ) diff --git a/iso_host/iso8583_auth_req_handler.go b/iso_host/iso8583_auth_req_handler.go index 6946649..9741770 100644 --- a/iso_host/iso8583_auth_req_handler.go +++ b/iso_host/iso8583_auth_req_handler.go @@ -1,7 +1,7 @@ package iso_host import ( - "libiso/iso8583" + "github.com/rkbalgi/libiso/iso8583" "strconv" "time" ) diff --git a/iso_host/iso8583_network_req_handler.go b/iso_host/iso8583_network_req_handler.go index c4a3e08..d5a5b8d 100644 --- a/iso_host/iso8583_network_req_handler.go +++ b/iso_host/iso8583_network_req_handler.go @@ -1,6 +1,6 @@ package iso_host -import "libiso/iso8583" +import "github.com/rkbalgi/libiso/iso8583" func handleNetworkReq(isoResp *iso8583.Iso8583Message) { diff --git a/iso_host/iso8583_reversal_req_handler.go b/iso_host/iso8583_reversal_req_handler.go index 289f8b7..5786fe8 100644 --- a/iso_host/iso8583_reversal_req_handler.go +++ b/iso_host/iso8583_reversal_req_handler.go @@ -1,6 +1,6 @@ package iso_host -import "libiso/iso8583" +import "github.com/rkbalgi/libiso/iso8583" func handleReversalReq(isoResp *iso8583.Iso8583Message) { diff --git a/iso_host/iso_host_handler.go b/iso_host/iso_host_handler.go index a6c4607..a3e650e 100644 --- a/iso_host/iso_host_handler.go +++ b/iso_host/iso_host_handler.go @@ -3,7 +3,7 @@ package iso_host import ( "bytes" "errors" - . "libiso/iso8583" + . "github.com/rkbalgi/libiso/iso8583" "log" "os" )