vicc: catch ctrl-c via KeyboardInterrupt

... and ignore EINT in recv as it may be triggered for various other reasons

fixes frankmorgner#95

virtualsmartcard/src/vpicc/vicc.in

@@ -157,4 +157,7 @@ vicc = VirtualICC(args.datasetfile, args.type, hostname, args.port,
         ef_cardsecurity=ef_cardsecurity_data, ca_key=ca_key_data, cvca=cvca,
         disable_checks=args.disable_ta_checks, esign_ca_cert=esign_ca_cert,
         esign_cert=esign_cert, logginglevel=logginglevel)
-vicc.run()
+try:
+    vicc.run()
+except KeyboardInterrupt:
+    pass

virtualsmartcard/src/vpicc/virtualsmartcard/VirtualSmartcard.py

@@ -18,8 +18,8 @@
 #
 
 import atexit
+import errno
 import logging
-import signal
 import socket
 import struct
 import sys
@@ -475,14 +475,8 @@ def __init__(self, datasetfile, card_type, host, port,
 
         logging.info("Connected to virtual PCD at %s:%u", host, port)
 
-        signal.signal(signal.SIGINT, self.signalHandler)
         atexit.register(self.stop)
 
-    def signalHandler(self, sig=None, frame=None):
-        """Basically this signal handler just surpresses a traceback from being
-           printed when the user presses crtl-c"""
-        sys.exit()
-
     @staticmethod
     def connectToPort(host, port):
         """
@@ -509,15 +503,27 @@ def __sendToVPICC(self, msg):
     def __recvFromVPICC(self):
         """ Receive a message from the vpcd """
         # receive message size
-        sizestr = self.sock.recv(_Csizeof_short)
+        while True:
+            try:
+                sizestr = self.sock.recv(_Csizeof_short)
+            except socket.error as e:
+                if e.errno == errno.EINTR:
+                    continue
+            break
         if len(sizestr) == 0:
             logging.info("Virtual PCD shut down")
             raise socket.error
         size = struct.unpack('!H', sizestr)[0]
 
         # receive and return message
         if size:
-            msg = self.sock.recv(size)
+            while True:
+                try:
+                    msg = self.sock.recv(size)
+                except socket.error as e:
+                    if e.errno == errno.EINTR:
+                        continue
+                break
             if len(msg) == 0:
                 logging.info("Virtual PCD shut down")
                 raise socket.error