Diff

Differences From Artifact [04de0bb64d]:

To Artifact [77eca6ccda]:


  3842   3842   				memcpy(identities[id_idx].pcsc_identity->certificate, pcsc_identities[cert_idx].certificate, pcsc_identities[cert_idx].certificate_len);
  3843   3843   
  3844   3844   				id_idx++;
  3845   3845   			}
  3846   3846   		}
  3847   3847   
  3848   3848   		if (include_extra_certs) {
  3849         -			CACKEY_DEBUG_PRINTF("Including DoD Certificates on hardware slot");
         3849  +			CACKEY_DEBUG_PRINTF("Including US Government Certificates on hardware slot");
  3850   3850   
  3851   3851   			cackey_read_dod_identities(identities + id_idx, num_dod_certs);
  3852   3852   		}
  3853   3853   
  3854   3854   		cackey_free_certs(pcsc_identities, num_certs, 1);
  3855   3855   
  3856   3856   		*ids_found = num_ids;
................................................................................
  3915   3915   	} else {
  3916   3916   		highest_slot = (sizeof(cackey_slots) / sizeof(cackey_slots[0])) - 1;
  3917   3917   
  3918   3918   		CACKEY_DEBUG_PRINTF("Including DoD certs in slot %lu", (unsigned long) highest_slot);
  3919   3919   
  3920   3920   		cackey_slots[highest_slot].active = 1;
  3921   3921   		cackey_slots[highest_slot].internal = 1;
  3922         -		cackey_slots[highest_slot].label = (unsigned char *) "DoD Certificates";
         3922  +		cackey_slots[highest_slot].label = (unsigned char *) "US Government Certificates";
  3923   3923   		cackey_slots[highest_slot].pcsc_reader = "CACKey";
  3924   3924   		cackey_slots[highest_slot].token_flags = 0;
  3925   3925   	}
  3926   3926   
  3927   3927   	cackey_initialized = 1;
  3928   3928   
  3929   3929   	if (!cackey_biglock_init) {