giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename variable rand in rand_buf 

pkcs15-oberthur-awp.c: In function ‘awp_new_container_entry’:
pkcs15-oberthur-awp.c:241: warning: declaration of ‘rand’ shadows a global declaration
/usr/include/stdlib.h:176: warning: shadowed declaration is here


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4204 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
ludovic.rousseau 2010-04-02 12:21:48 +00:00
parent 8f6317b31b
commit d4b143830a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkcs15init/pkcs15-oberthur-awp.c
View File

@ -238,23 +238,23 @@ awp_new_container_entry(struct sc_pkcs15_card *p15card, unsigned char *buff, int
struct sc_context *ctx = p15card->card->ctx;
int ii, mm, rv = 0;
int marks[5] = {4,6,8,10,0};
unsigned char rand[0x10];
unsigned char rand_buf[0x10];
SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL);
if (len<0x34)
SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, SC_ERROR_INCORRECT_PARAMETERS, "Invalid container update size");
rv = sc_get_challenge(p15card->card, rand, sizeof(rand));
rv = sc_get_challenge(p15card->card, rand_buf, sizeof(rand_buf));
SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot get challenge");
*(buff + 12) = 0x26;
*(buff + 13) = '{';
for (ii=0, mm = 0; ii<sizeof(rand); ii++) {
for (ii=0, mm = 0; ii<sizeof(rand_buf); ii++) {
if (ii==marks[mm]) {
*(buff + 14 + ii*2 + mm) = '-';
mm++;
}
sprintf((char *)(buff + 14 + ii*2 + mm),"%02X", rand[ii]);
sprintf((char *)(buff + 14 + ii*2 + mm),"%02X", rand_buf[ii]);
}
*(buff + 14 + ii*2 + mm) = (unsigned char)'}';