Changeset 2915 for releases

Timestamp:

04/26/06 11:41:55 (3 years ago)

Author:

aj

Message:

fix signed and size_t warnings.

Location:

releases/opensc-0.11.0/src

Files:

• pkcs11/openssl.c (modified) (1 diff)
• pkcs11/pkcs11-display.c (modified) (1 diff)
• pkcs11/sc-pkcs11.h (modified) (1 diff)
• tests/print.c (modified) (3 diffs)
• tools/eidenv.c (modified) (3 diffs)
• tools/netkey-tool.c (modified) (5 diffs)
• tools/opensc-explorer.c (modified) (2 diffs)
• tools/opensc-tool.c (modified) (3 diffs)
• tools/piv-tool.c (modified) (2 diffs)
• tools/pkcs11-tool.c (modified) (2 diffs)
• tools/pkcs15-crypt.c (modified) (2 diffs)
• tools/pkcs15-tool.c (modified) (10 diffs)

releases/opensc-0.11.0/src/pkcs11/openssl.c

@@ -192 +192 @@
  *   finishing with EVP_VerifyFinal().
  */
-CK_RV sc_pkcs11_verify_data(unsigned char *pubkey, int pubkey_len,
+CK_RV sc_pkcs11_verify_data(const unsigned char *pubkey, int pubkey_len,
                         CK_MECHANISM_TYPE mech, sc_pkcs11_operation_t *md,
                         unsigned char *data, int data_len,

releases/opensc-0.11.0/src/pkcs11/pkcs11-display.c

@@ -135 +135 @@
   if(size && value) {
     X509_NAME *name;
-    name = d2i_X509_NAME(NULL, (unsigned char **)&value, size);
+    name = d2i_X509_NAME(NULL, (const unsigned char **)&value, size);
     if(name) {
       BIO *bio = BIO_new(BIO_s_file());

releases/opensc-0.11.0/src/pkcs11/sc-pkcs11.h

@@ -431 +431 @@
 CK_RV sc_pkcs11_gen_keypair_soft(CK_KEY_TYPE keytype, CK_ULONG keybits,
         struct sc_pkcs15_prkey *privkey, struct sc_pkcs15_pubkey *pubkey);
-CK_RV sc_pkcs11_verify_data(unsigned char *pubkey, int pubkey_len,
+CK_RV sc_pkcs11_verify_data(const unsigned char *pubkey, int pubkey_len,
         CK_MECHANISM_TYPE mech, sc_pkcs11_operation_t *md,
         unsigned char *inp, int inp_len,

releases/opensc-0.11.0/src/tests/print.c

@@ -66 +66 @@
                 }
         printf("\n");
-        printf("\tLength      : min_len:%d, max_len:%d, stored_len:%d\n", pin->min_length, pin->max_length, pin->stored_length);
+        printf("\tLength      : min_len:%lu, max_len:%lu, stored_len:%lu\n", pin->min_length, pin->max_length, pin->stored_length);
         printf("\tPad char    : 0x%02X\n", pin->pad_char);
         printf("\tReference   : %d\n", pin->reference);
@@ -123 +123 @@
         printf("\n");
         if (obj->type == SC_PKCS15_TYPE_PRKEY_RSA)
-                printf("\tModLength   : %d\n", prkey->modulus_length);
+                printf("\tModLength   : %lu\n", prkey->modulus_length);
         printf("\tKey ref     : %d\n", prkey->key_reference);
         printf("\tNative      : %s\n", prkey->native ? "yes" : "no");
@@ -170 +170 @@
         printf("\n");
         if (obj->type == SC_PKCS15_TYPE_PUBKEY_RSA)
-                printf("\tModLength   : %d\n", pubkey->modulus_length);
+                printf("\tModLength   : %lu\n", pubkey->modulus_length);
         printf("\tKey ref     : %d\n", pubkey->key_reference);
         printf("\tNative      : %s\n", pubkey->native ? "yes" : "no");

releases/opensc-0.11.0/src/tools/eidenv.c

@@ -139 +139 @@
         sc_path_t path;
         int r, i;
-        char buff[512];
+        unsigned char buff[512];
 
         if (stats) {
@@ -182 +182 @@
                 buff[r] = '\0';
                 if (exec_program) {
-                        char * cp;
+                        unsigned char * cp;
                         cp = malloc(strlen(esteid_data[i].env_name) + 
-                        strlen(buff) + 2);
+                                strlen((char *) buff) + 2);
                         if (cp) { 
-                                strcpy(cp,esteid_data[i].env_name);
-                                strcat(cp,"=");
-                                strcat(cp,buff);
-                                putenv(cp);
+                                strcpy((char *) cp,esteid_data[i].env_name);
+                                strcat((char *) cp,"=");
+                                strcat((char *) cp,(char *) buff);
+                                putenv((char *) cp);
                         }
                 } else {
@@ -320 +320 @@
                 {NULL, 0, 0, 0, NULL, NULL}};
 
-        char buff[512];
+        unsigned char buff[512];
         int r;
 

releases/opensc-0.11.0/src/tools/netkey-tool.c

@@ -96 +96 @@
            f->prop_attr_len!=5 || f->prop_attr[0]!=0x01 || f->prop_attr[1]!=0x80
         ){
-                printf("\nInvald PIN-file: Type=%d, EF-Structure=%d, Prop-Len=%d %02X:%02X:%02X\n",
+                printf("\nInvald PIN-file: Type=%d, EF-Structure=%d, Prop-Len=%lu %02X:%02X:%02X\n",
                         f->type, f->ef_structure, f->prop_attr_len,
                         f->prop_attr[0], f->prop_attr[1], f->prop_attr[2]
@@ -134 +134 @@
         printf("\n");
         for(i=0;i<sizeof(certlist)/sizeof(certlist[0]);++i){
-                printf("Certificate %d: %s", i, certlist[i].label); fflush(stdout);
+                printf("Certificate %lu: %s", i, certlist[i].label); fflush(stdout);
 
                 sc_format_path(certlist[i].path,&p);
@@ -151 +151 @@
                         continue;
                 }
-                printf(", Maxlen=%u", f->size);
+                printf(", Maxlen=%lu", f->size);
                 q=buf;
                 if(q[0]==0x30 && q[1]==0x82){
                         if(q[4]==6 && q[5]<10 && q[q[5]+6]==0x30 && q[q[5]+7]==0x82) q+=q[5]+6;
-                        printf(", Len=%u\n", (q[2]<<8)|q[3]);
+                        printf(", Len=%d\n", (q[2]<<8)|q[3]);
                         if((c=d2i_X509(NULL,&q,f->size))){
                                 X509_NAME_get_text_by_NID(c->cert_info->subject, NID_commonName, buf,sizeof(buf));
@@ -234 +234 @@
            file->size!=12 || (len=sc_read_binary(card,0,buf,12,0))!=12 || buf[0]!=0x5A || buf[1]!=0x0A
         ){
-                printf("\nInvald Serial-Number: Type=%d, EF-Structure=%d, Size=%d\n",
+                printf("\nInvald Serial-Number: Type=%d, EF-Structure=%d, Size=%lu\n",
                         file->type, file->ef_structure, file->size
                 );
@@ -589 +589 @@
         for(i=0; i < sc_ctx_get_reader_count(ctx); ++i){
                 sc_reader_t *reader = sc_ctx_get_reader(ctx, i);
-                printf("%d: %s, Driver: %s, %d Slot(s)\n", i, reader->name,
+                printf("%lu: %s, Driver: %s, %d Slot(s)\n", i, reader->name,
                         reader->driver->name, reader->slot_count);
         }

releases/opensc-0.11.0/src/tools/opensc-explorer.c

@@ -176 +176 @@
         }
         printf("\t%4s", st);
-        printf(" %5d", file->size);
+        printf(" %5lu", file->size);
         if (file->namelen) {
                 printf("\tName: ");
@@ -419 +419 @@
                 }
         }
-        printf("\n%-15s%d bytes\n", "File size:", file->size);
+        printf("\n%-15s%lu bytes\n", "File size:", file->size);
 
         if (file->type == SC_FILE_TYPE_DF) {

releases/opensc-0.11.0/src/tools/opensc-tool.c

@@ -174 +174 @@
                 printf("ef structure: %s, ", structs[file->ef_structure]);
         }
-        printf("size: %d\n", file->size);
+        printf("size: %lu\n", file->size);
         for (r = 0; r < depth; r++)
                 printf("  ");
@@ -311 +311 @@
                         apdu.datalen = apdu.lc;
                         if (len < apdu.lc) {
-                                fprintf(stderr, "APDU too short (need %d bytes).\n",
+                                fprintf(stderr, "APDU too short (need %lu bytes).\n",
                                         apdu.lc-len);
                                 return 2;
@@ -325 +325 @@
                                 apdu.cse = SC_APDU_CASE_3_SHORT;
                         if (len) {
-                                fprintf(stderr, "APDU too long (%d bytes extra).\n", len);
+                                fprintf(stderr, "APDU too long (%lu bytes extra).\n", len);
                                 return 2;
                         }

releases/opensc-0.11.0/src/tools/piv-tool.c

@@ -280 +280 @@
                         apdu.datalen = apdu.lc;
                         if (len < apdu.lc) {
-                                fprintf(stderr, "APDU too short (need %d bytes).\n",
+                                fprintf(stderr, "APDU too short (need %lu bytes).\n",
                                         apdu.lc-len);
                                 return 2;
@@ -294 +294 @@
                                 apdu.cse = SC_APDU_CASE_3_SHORT;
                         if (len) {
-                                fprintf(stderr, "APDU too long (%d bytes extra).\n", len);
+                                fprintf(stderr, "APDU too long (%lu bytes extra).\n", len);
                                 return 2;
                         }

releases/opensc-0.11.0/src/tools/pkcs11-tool.c

@@ -784 +784 @@
 init_token(CK_SLOT_ID slot)
 {
-        char token_label[33];
+        unsigned char token_label[33];
         char new_buf[21], *new_pin = NULL;
         CK_TOKEN_INFO   info;
@@ -791 +791 @@
         if (!opt_object_label)
                 fatal("The token label must be specified using --label\n");
-        snprintf(token_label, sizeof (token_label), "%-32.32s",
+        snprintf((char *) token_label, sizeof (token_label), "%-32.32s",
                         opt_object_label);
 

releases/opensc-0.11.0/src/tools/pkcs15-crypt.c

@@ -252 +252 @@
                         else {
                                 fprintf(stderr,
-                                        "Invalid input size (%u bytes)\n",
+                                        "Invalid input size (%lu bytes)\n",
                                         len);
                                 return SC_ERROR_INVALID_ARGUMENTS;
@@ -294 +294 @@
          && !(opt_crypt_flags & SC_ALGORITHM_RSA_PAD_PKCS1)
          && (size_t)c != key->modulus_length/8) {
-                fprintf(stderr, "Input has to be exactly %d bytes, when using no padding.\n",
+                fprintf(stderr, "Input has to be exactly %lu bytes, when using no padding.\n",
                         key->modulus_length/8);
                 return 2;

releases/opensc-0.11.0/src/tools/pkcs15-tool.c

@@ -217 +217 @@
         size_t i;
         
-        printf("%s (%i bytes): <", kind, data_len);
+        printf("%s (%lu bytes): <", kind, data_len);
         for (i = 0; i < data_len; i++)
                 printf(" %02X", data[i]);
@@ -240 +240 @@
                 for (i=0; i < data_len; i++)
                         fprintf(outf, "%c", data[i]);
-                printf("Dumping (%i bytes) to file <%s>: <", data_len, opt_outfile);
+                printf("Dumping (%lu bytes) to file <%s>: <", data_len, opt_outfile);
                 for (i=0; i < data_len; i++)
                         printf(" %02X", data[i]);
@@ -246 +246 @@
                 fclose(outf);
         } else {
-                printf("%s (%i bytes): <", kind, data_len);
+                printf("%s (%lu bytes): <", kind, data_len);
                 for (i=0; i < data_len; i++)
                         printf(" %02X", data[i]);
@@ -412 +412 @@
                 }
         printf("\n");
-        printf("\tModLength   : %d\n", prkey->modulus_length);
+        printf("\tModLength   : %lu\n", prkey->modulus_length);
         printf("\tKey ref     : %d\n", prkey->key_reference);
         printf("\tNative      : %s\n", prkey->native ? "yes" : "no");
@@ -470 +470 @@
                 }
         printf("\n");
-        printf("\tModLength   : %d\n", pubkey->modulus_length);
+        printf("\tModLength   : %lu\n", pubkey->modulus_length);
         printf("\tKey ref     : %d\n", pubkey->key_reference);
         printf("\tNative      : %s\n", pubkey->native ? "yes" : "no");
@@ -635 +635 @@
 
         if (pubkey->algorithm == SC_ALGORITHM_RSA) {
-                char buf[2048];
-                char *uu;
+                unsigned char buf[2048];
+                unsigned char *uu;
                 uint32_t len;
                 uint32_t n;
@@ -645 +645 @@
                 buf[3]=7;
 
-                len = sprintf(buf+4,"ssh-rsa");
+                len = sprintf((char *) buf+4,"ssh-rsa");
                 len+=4;
 
@@ -687 +687 @@
 
         if (pubkey->algorithm == SC_ALGORITHM_DSA) {
-                char buf[2048];
-                char *uu;
+                unsigned char buf[2048];
+                unsigned char *uu;
                 uint32_t len;
                 uint32_t n;
@@ -697 +697 @@
                 buf[3]=7;
 
-                len = sprintf(buf+4,"ssh-dss");
+                len = sprintf((char *) buf+4,"ssh-dss");
                 len+=4;
 
@@ -883 +883 @@
                 }
         printf("\n");
-        printf("\tLength    : min_len:%d, max_len:%d, stored_len:%d\n",
+        printf("\tLength    : min_len:%lu, max_len:%lu, stored_len:%lu\n",
                                 pin->min_length, pin->max_length, pin->stored_length);
         printf("\tPad char  : 0x%02X\n", pin->pad_char);