Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tddl/tddl.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004, 2005
  *
  */
 
@@ skipping 14 matching lines @@
 struct tpm_device_node tpm_device_nodes[] = {
         {"/dev/tpm0", TDDL_UNDEF, TDDL_UNDEF},
         {"/udev/tpm0", TDDL_UNDEF, TDDL_UNDEF},
         {"/dev/tpm", TDDL_UNDEF, TDDL_UNDEF},
         {NULL, 0, 0}
 };
 
 struct tpm_device_node *opened_device = NULL;
 
 BYTE txBuffer[TDDL_TXBUF_SIZE];
+TSS_BOOL use_in_socket = FALSE;
+struct tcsd_config *_tcsd_options = NULL;
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <netdb.h>
+#include <fcntl.h>
+
 
 int
-open_device(void)
+open_device()
 {
-        int i;
+        int i = 0, fd = -1, tcp_device_port;
+        char *tcp_device_hostname = NULL;
+        char *un_socket_device_path = NULL;
+        char *tcp_device_port_string = NULL;
+        
+        if (getenv("TCSD_USE_TCP_DEVICE")) {
+                if ((tcp_device_hostname = getenv("TCSD_TCP_DEVICE_HOSTNAME")) == NULL)
+                        tcp_device_hostname = "localhost";
+                if ((un_socket_device_path = getenv("TCSD_UN_SOCKET_DEVICE_PATH")) == NULL)
+                        un_socket_device_path = "/var/run/tpm/tpmd_socket:0";
+                if ((tcp_device_port_string = getenv("TCSD_TCP_DEVICE_PORT")) != NULL)
+                        tcp_device_port = atoi(tcp_device_port_string);
+                else
+                        tcp_device_port = 6545;
+         
+                
+                fd = socket(AF_INET, SOCK_STREAM, 0);
+                if (fd > 0) {
+                        struct hostent *host = gethostbyname(tcp_device_hostname);
+                        if (host != NULL) {   
+                                struct sockaddr_in addr;
+                                memset(&addr, 0x0, sizeof(addr));
+                                addr.sin_family = host->h_addrtype;
+                                addr.sin_port   = htons(tcp_device_port);
+                                memcpy(&addr.sin_addr,
+                                                host->h_addr,
+                                                host->h_length);
+                                if (connect(fd, (struct sockaddr *)&addr,
+                                            sizeof(addr)) < 0) {
+                                        close(fd);
+                                        fd = -1;
+                                } else
+                                        use_in_socket = TRUE;
+                        } else {
+                                close (fd);
+                                fd = -1;
+                        }
+                }
+               
+                if (fd < 0) {
+                        struct sockaddr_un addr;
 
-        /* tpm_device_paths is filled out in tddl.h */
-        for (i = 0; tpm_device_nodes[i].path != NULL; i++) {
-                errno = 0;
-                if ((tpm_device_nodes[i].fd = open(tpm_device_nodes[i].path, O_RDWR)) < 0)
-                        continue;
-
+                        fd = socket(AF_UNIX, SOCK_STREAM, 0);
+                        if (fd >= 0) {
+                                addr.sun_family = AF_UNIX;
+                                strncpy(addr.sun_path, un_socket_device_path,
+                                                sizeof(addr.sun_path));
+                                if (connect(fd, (void *)&addr, sizeof(addr)) < 0) {
+                                        close(fd);
+                                        fd = -1;
+                                }
+                        }
+                }
+        } 
+        
+        if (fd < 0) {
+                /* tpm_device_paths is filled out in tddl.h */
+                for (i = 0; tpm_device_nodes[i].path != NULL; i++) {
+                        errno = 0;
+                        if ((fd = open(tpm_device_nodes[i].path, O_RDWR)) >= 0)
+                                break;
+                }
+        }
+        
+        if (fd > 0) {
                 opened_device = &(tpm_device_nodes[i]);
-                return opened_device->fd;
+                tpm_device_nodes[i].fd = fd;
         }
-
-        return -1;
+        return fd;
 }
 
 TSS_RESULT
 Tddli_Open()
 {
         int rc;
 
         if (opened_device != NULL) {
                 LogDebug("attempted to re-open the TPM driver!");
                 return TDDLERR(TDDL_E_ALREADY_OPENED);
@@ skipping 35 matching lines @@
         int sizeResult;
 
         if (TransmitBufLen > TDDL_TXBUF_SIZE) {
                 LogError("buffer size handed to TDDL is too large! (%u bytes)", TransmitBufLen);
                 return TDDLERR(TDDL_E_FAIL);
         }
 
         memcpy(txBuffer, pTransmitBuf, TransmitBufLen);
         LogDebug("Calling write to driver");
 
+        if (use_in_socket) {
+                Tddli_Close();
+                if (Tddli_Open())
+                        return TDDLERR(TDDL_E_IOERROR);
+        }
+
         switch (opened_device->transmit) {
                 case TDDL_UNDEF:
                         /* fall through */
                 case TDDL_TRANSMIT_IOCTL:
                         errno = 0;
                         if ((sizeResult = ioctl(opened_device->fd, TPMIOC_TRANSMIT, txBuffer)) != -1) {
                                 opened_device->transmit = TDDL_TRANSMIT_IOCTL;
                                 break;
                         }
                         LogWarn("ioctl: (%d) %s", errno, strerror(errno));
@@ skipping 75 matching lines @@
                 } else if (rc == -EIO) {
                         /* The driver timed out while trying to tell the chip to cancel */
                         return TDDLERR(TDDL_E_COMMAND_COMPLETED);
                 }
 
                 return TSS_SUCCESS;
         } else {
                 return TDDLERR(TSS_E_NOTIMPL);
         }
 }