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

src/tspi/obj_rsakey.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2005, 2007
  *
  */
 
@@ skipping 64 matching lines @@
                         rsakey->key.hdr.key12.fill = 0;
                         rsakey->type = TSS_KEY_STRUCT_KEY12;
                         rsakey->pcrInfoType = TSS_PCRS_STRUCT_INFO_LONG;
                         break;
                 default:
                         free(rsakey);
                         return TSPERR(TSS_E_INVALID_OBJECT_INITFLAG);
                         break;
         }
 
-        if (initFlags & TSS_KEY_EMPTY_KEY)
+        if (initFlags == TSS_KEY_EMPTY_KEY)
                 goto add_key;
 
         memset(&rsaKeyParms, 0, sizeof(TCPA_RSA_KEY_PARMS));
 
         rsakey->key.algorithmParms.algorithmID = TCPA_ALG_RSA;
         rsakey->key.algorithmParms.parmSize = sizeof(TCPA_RSA_KEY_PARMS);
 
         rsakey->key.algorithmParms.parms = calloc(1, sizeof(TCPA_RSA_KEY_PARMS));
         if (rsakey->key.algorithmParms.parms == NULL) {
                 LogError("calloc of %u bytes failed.", rsakey->key.algorithmParms.parmSize);
@@ skipping 2030 matching lines @@
 
         if (value)
                 rsakey->flags |= TSS_RSAKEY_FLAG_OWNEREVICT;
         else
                 rsakey->flags &= ~TSS_RSAKEY_FLAG_OWNEREVICT;
 
         obj_list_put(&rsakey_list);
 
         return TSS_SUCCESS;
 }