aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Redon <kevredon@mail.tsaitgaist.info>2011-05-06 19:19:43 +0200
committerKevin Redon <kevredon@mail.tsaitgaist.info>2011-05-06 19:19:43 +0200
commitb2218d21b542fa66f19f51bbbaaf694f6a21395c (patch)
treeadf82a648254dec75c619bb30b797114af3ed4e6
parent2f5262ee15621eff7cd3acf6013dda92b8af90ad (diff)
files moved
-rwxr-xr-xsrc/apdu_forward.rb2
-rwxr-xr-xsrc/demo_client.rb2
-rw-r--r--src/pcsc_server.rb2
-rw-r--r--src/sap/client.rb (renamed from src/lib/client.rb)2
-rw-r--r--src/sap/common.rb (renamed from src/lib/common.rb)0
-rw-r--r--src/sap/server.rb (renamed from src/lib/server.rb)2
-rw-r--r--src/sim_server.rb2
-rw-r--r--src/tools/bluetooth_sap_serial.rb (renamed from src/lib/bluetooth_sap_serial.rb)1
8 files changed, 6 insertions, 7 deletions
diff --git a/src/apdu_forward.rb b/src/apdu_forward.rb
index 5bcee86..383fe8c 100755
--- a/src/apdu_forward.rb
+++ b/src/apdu_forward.rb
@@ -18,7 +18,7 @@ along with sofSIM. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
# this programm will forward APDU from an IO to a SAP server
-require 'lib/client'
+require 'sap/client'
require 'socket'
SAP_HOST = "localhost"
diff --git a/src/demo_client.rb b/src/demo_client.rb
index 2c65c5f..c0573a5 100755
--- a/src/demo_client.rb
+++ b/src/demo_client.rb
@@ -18,7 +18,7 @@ along with sofSIM. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
# this programm will create a client which can be used to test servers
-require 'lib/client'
+require 'sap/client'
require 'lib/apdu'
#=============
diff --git a/src/pcsc_server.rb b/src/pcsc_server.rb
index 9f1b2e0..69f2112 100644
--- a/src/pcsc_server.rb
+++ b/src/pcsc_server.rb
@@ -17,7 +17,7 @@ along with sofSIM. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
-require 'lib/server'
+require 'sap/server'
require 'rubygems'
require 'smartcard'
=begin
diff --git a/src/lib/client.rb b/src/sap/client.rb
index 1159cdf..7776dcd 100644
--- a/src/lib/client.rb
+++ b/src/sap/client.rb
@@ -18,7 +18,7 @@ Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
# this is the client part of the SAP
# it implements the state machine for the client
-require 'lib/common'
+require 'sap/common'
# this is an abstract class
# TODO :
diff --git a/src/lib/common.rb b/src/sap/common.rb
index d544ffa..d544ffa 100644
--- a/src/lib/common.rb
+++ b/src/sap/common.rb
diff --git a/src/lib/server.rb b/src/sap/server.rb
index 4ba0476..e8e4337 100644
--- a/src/lib/server.rb
+++ b/src/sap/server.rb
@@ -19,7 +19,7 @@ Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
# this is the server part of the SAP
# it implements the state machine for the server
# this is an abstract class
-require 'lib/common'
+require 'sap/common'
# this is an bastract class
# TODO (not implemented) :
diff --git a/src/sim_server.rb b/src/sim_server.rb
index 71e787e..de66f4b 100644
--- a/src/sim_server.rb
+++ b/src/sim_server.rb
@@ -17,7 +17,7 @@ along with sofSIM. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
-require 'lib/server'
+require 'sap/server'
require 'lib/apdu'
require 'socket'
require 'xml'
diff --git a/src/lib/bluetooth_sap_serial.rb b/src/tools/bluetooth_sap_serial.rb
index 3d0d417..8635727 100644
--- a/src/lib/bluetooth_sap_serial.rb
+++ b/src/tools/bluetooth_sap_serial.rb
@@ -17,7 +17,6 @@ along with sofSIM. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2011 Kevin "tsaitgaist" Redon kevredon@mail.tsaitgaist.info
=end
-require 'lib/client' # SAP client
require 'dbus' # libdbus-ruby
=begin
to monitor bluetooth traffic