Changeset 3463 for trunk/src

Timestamp:

04/07/08 19:25:21 (9 months ago)

Author:

alonbl

Message:

ruToken C fixups

http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011011.html

By Douglas E. Engert

Location:

trunk/src/libopensc

Files:

• card-rutoken.c (modified) (7 diffs)
• pkcs15-prkey-rutoken.c (modified) (4 diffs)

trunk/src/libopensc/card-rutoken.c

@@ -127 +127 @@
 {
         int ret = SC_ERROR_MEMORY_FAILURE;
+        unsigned int flags = SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_PKCS1;
+                                /* SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_HASH_SHA1
+                                | SC_ALGORITHM_RSA_HASH_MD5_SHA1
+                                | SC_ALGORITHM_RSA_PAD_NONE */
+        sc_algorithm_info_t info;
 
         SC_FUNC_CALLED(card->ctx, 1);
@@ -140 +145 @@
         /* add algorithm 
         TODO: may nid som other flag  */
-        unsigned int flags = SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_PKCS1;
-                                /* SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_HASH_SHA1
-                                | SC_ALGORITHM_RSA_HASH_MD5_SHA1
-                                | SC_ALGORITHM_RSA_PAD_NONE */
 
         _sc_card_add_rsa_alg(card, 256, flags, 0);
@@ -150 +151 @@
         _sc_card_add_rsa_alg(card, 1024, flags, 0);
         _sc_card_add_rsa_alg(card, 2048, flags, 0);
-        sc_algorithm_info_t info;
         flags = SC_ALGORITHM_GOST_CRYPT_PZ | SC_ALGORITHM_GOST_CRYPT_GAMM
                 | SC_ALGORITHM_GOST_CRYPT_GAMMOS;
@@ -283 +283 @@
 static int rutoken_list_files(sc_card_t *card, u8 *buf, size_t buflen)
 {
-        SC_FUNC_CALLED(card->ctx, 1);
         u8 rbuf[256];
         u8 previd[2];
         int r = 0, len=0;
         sc_apdu_t apdu;
+
         SC_FUNC_CALLED(card->ctx, 1);
         /*  sc_debug(card->ctx, "\n\tpath = %s\n\ttype = %d", hexdump(path, pathlen), in_path->type);  */
@@ -707 +707 @@
                          int se_num)
 {
-        SC_FUNC_CALLED(card->ctx, 1);
         sc_apdu_t apdu;
         auth_senv_t *senv = (auth_senv_t*)card->drv_data;
-        if (!senv || !env) return SC_ERROR_INVALID_ARGUMENTS;
         u8      data[3] = {0x83, 0x01, env->key_ref[0]};
         int ret = SC_NO_ERROR;
+
+        SC_FUNC_CALLED(card->ctx, 1);
+        if (!senv || !env) return SC_ERROR_INVALID_ARGUMENTS;
         if(env->algorithm == SC_ALGORITHM_RSA)
         {
@@ -1196 +1197 @@
                 if ( r < 0)
                         {
+                                char error[1024];
+
                                 ret = SC_ERROR_INTERNAL;
-                                char error[1024];
                                 ERR_load_crypto_strings();
                                 ERR_error_string(ERR_get_error(), error);
@@ -1225 +1227 @@
                 if ( ret < 0)
                         {
+                        char error[1024];
+
                         ret = SC_ERROR_INTERNAL;
-                        char error[1024];
                         ERR_load_crypto_strings();
                         ERR_error_string(ERR_get_error(), error);

trunk/src/libopensc/pkcs15-prkey-rutoken.c

@@ -98 +98 @@
         const u8 *tmp;
         size_t len = 2 + sizeof(pr_blob->blobheader) + sizeof(pr_blob->rsapubkey);
+        uint32_t bitlen;
 
         if (buf_len < len)
@@ -109 +110 @@
         tmp += sizeof(pr_blob->rsapubkey);
 
-        uint32_t bitlen = pr_blob->rsapubkey.bitlen;
+        bitlen = pr_blob->rsapubkey.bitlen;
 
         len += bitlen/8 * 2  +  bitlen/16 * 5;
@@ -272 +273 @@
 static int private_blob_to_bin(const RUPRIVATEKEYBLOB *pr_blob, u8 *buf, size_t *buf_len)
 {
+        u8 *tmp;
         size_t len = 2 + sizeof(pr_blob->blobheader) + sizeof(pr_blob->rsapubkey);
 
@@ -279 +281 @@
         buf[0] = 2;
         buf[1] = 1;
-        u8 *tmp = buf + 2;
+        tmp = buf + 2;
         memcpy(tmp, &pr_blob->blobheader, sizeof(pr_blob->blobheader));
         tmp += sizeof(pr_blob->blobheader);