Fix indentation.
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1708 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
eced6ca821
commit
dfb3f21069
11
cssp.c
11
cssp.c
@ -297,7 +297,8 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
|
||||
#define AT_SIGNATURE 2
|
||||
|
||||
static STREAM
|
||||
cssp_encode_tscspdatadetail(unsigned char keyspec, char *card, char *reader, char *container, char *csp)
|
||||
cssp_encode_tscspdatadetail(unsigned char keyspec, char *card, char *reader, char *container,
|
||||
char *csp)
|
||||
{
|
||||
int i;
|
||||
STREAM out;
|
||||
@ -367,7 +368,8 @@ cssp_encode_tscspdatadetail(unsigned char keyspec, char *card, char *reader, cha
|
||||
}
|
||||
|
||||
// cspName [4]
|
||||
if (csp) {
|
||||
if (csp)
|
||||
{
|
||||
s_reset(&tmp);
|
||||
for (i = 0; i < strlen(csp); i++)
|
||||
out_uint16_le(&tmp, csp[i]);
|
||||
@ -391,7 +393,7 @@ cssp_encode_tscspdatadetail(unsigned char keyspec, char *card, char *reader, cha
|
||||
}
|
||||
|
||||
static STREAM
|
||||
cssp_encode_tssmartcardcreds(char *username, char *password,char *domain)
|
||||
cssp_encode_tssmartcardcreds(char *username, char *password, char *domain)
|
||||
{
|
||||
int i;
|
||||
STREAM out, h1, h2;
|
||||
@ -419,7 +421,8 @@ cssp_encode_tssmartcardcreds(char *username, char *password,char *domain)
|
||||
s_free(h1);
|
||||
|
||||
// cspData[1]
|
||||
h2 = cssp_encode_tscspdatadetail(AT_KEYEXCHANGE, g_sc_card_name, g_sc_reader_name, g_sc_container_name, g_sc_csp_name);
|
||||
h2 = cssp_encode_tscspdatadetail(AT_KEYEXCHANGE, g_sc_card_name, g_sc_reader_name,
|
||||
g_sc_container_name, g_sc_csp_name);
|
||||
h1 = ber_wrap_hdr_data(BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 1, h2);
|
||||
out_uint8p(&message, h1->data, s_length(h1));
|
||||
s_free(h2);
|
||||
|
41
rdesktop.c
41
rdesktop.c
@ -245,11 +245,15 @@ usage(char *program)
|
||||
fprintf(stderr, " -5: use RDP version 5 (default)\n");
|
||||
#ifdef WITH_SCARD
|
||||
fprintf(stderr, " -o: name=value: Adds an additional option to rdesktop.\n");
|
||||
fprintf(stderr, " sc-csp-name Specifies the Crypto Service Provider name which\n");
|
||||
fprintf(stderr, " is used to authenticate the user by smartcard\n");
|
||||
fprintf(stderr, " sc-container-name Specifies the container name, this is usally the username\n");
|
||||
fprintf(stderr,
|
||||
" sc-csp-name Specifies the Crypto Service Provider name which\n");
|
||||
fprintf(stderr,
|
||||
" is used to authenticate the user by smartcard\n");
|
||||
fprintf(stderr,
|
||||
" sc-container-name Specifies the container name, this is usally the username\n");
|
||||
fprintf(stderr, " sc-reader-name Smartcard reader name to use\n");
|
||||
fprintf(stderr, " sc-card-name Specifies the card name of the smartcard to use\n");
|
||||
fprintf(stderr,
|
||||
" sc-card-name Specifies the card name of the smartcard to use\n");
|
||||
#endif
|
||||
|
||||
fprintf(stderr, "\n");
|
||||
@ -885,21 +889,30 @@ main(int argc, char *argv[])
|
||||
case 'o':
|
||||
{
|
||||
char *p = strchr(optarg, '=');
|
||||
if (p == NULL) {
|
||||
if (p == NULL)
|
||||
{
|
||||
warning("Skipping option '%s' specified, lacks name=value format.\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strncmp(optarg, "sc-csp-name", strlen("sc-scp-name")) == 0)
|
||||
g_sc_csp_name = strdup(p+1);
|
||||
else if (strncmp(optarg, "sc-reader-name", strlen("sc-reader-name")) == 0)
|
||||
g_sc_reader_name = strdup(p+1);
|
||||
else if (strncmp(optarg, "sc-card-name", strlen("sc-card-name")) == 0)
|
||||
g_sc_card_name = strdup(p+1);
|
||||
else if (strncmp(optarg, "sc-container-name", strlen("sc-container-name")) == 0)
|
||||
g_sc_container_name = strdup(p+1);
|
||||
if (strncmp(optarg, "sc-csp-name", strlen("sc-scp-name")) ==
|
||||
0)
|
||||
g_sc_csp_name = strdup(p + 1);
|
||||
else if (strncmp
|
||||
(optarg, "sc-reader-name",
|
||||
strlen("sc-reader-name")) == 0)
|
||||
g_sc_reader_name = strdup(p + 1);
|
||||
else if (strncmp
|
||||
(optarg, "sc-card-name",
|
||||
strlen("sc-card-name")) == 0)
|
||||
g_sc_card_name = strdup(p + 1);
|
||||
else if (strncmp
|
||||
(optarg, "sc-container-name",
|
||||
strlen("sc-container-name")) == 0)
|
||||
g_sc_container_name = strdup(p + 1);
|
||||
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case 'h':
|
||||
case '?':
|
||||
|
Loading…
Reference in New Issue
Block a user