Changeset 3457

Timestamp:

04/04/08 07:39:34 (8 months ago)

Author:

alonbl

Message:

Solve some Windows conflicts

Files:

• trunk/src/libopensc/pkcs15-prkey-rutoken.c (modified) (10 diffs)

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

@@ -43 +43 @@
 /*  BLOB definition  */
 
-typedef struct _RSAPUBKEY {
+typedef struct _RURSAPUBKEY {
         uint32_t magic;
         uint32_t bitlen;
         uint32_t pubexp;
-} RSAPUBKEY;
-
-typedef struct _PUBLICKEYSTRUC {
+} RURSAPUBKEY;
+
+typedef struct _RUPUBLICKEYSTRUC {
         u8 bType;
         u8 bVersion;
         uint16_t reserved;
         uint32_t aiKeyAlg;
-} BLOBHEADER;
-
-typedef struct _PRIVATEKEYBLOB {
-        BLOBHEADER blobheader;
-        RSAPUBKEY rsapubkey;
+} RUBLOBHEADER;
+
+typedef struct _RUPRIVATEKEYBLOB {
+        RUBLOBHEADER blobheader;
+        RURSAPUBKEY rsapubkey;
         u8 *modulus;
         u8 *prime1;
@@ -66 +66 @@
         u8 *coefficient;
         u8 *privateExponent;
-} PRIVATEKEYBLOB;
+} RUPRIVATEKEYBLOB;
 
 
@@ -82 +82 @@
 }
 
-static int free_private_blob(PRIVATEKEYBLOB *pr_blob)
+static int free_private_blob(RUPRIVATEKEYBLOB *pr_blob)
 {
         free(pr_blob->modulus);
@@ -94 +94 @@
 }
 
-static int bin_to_private_blob(PRIVATEKEYBLOB *pr_blob, const u8* buf, size_t buf_len)
+static int bin_to_private_blob(RUPRIVATEKEYBLOB *pr_blob, const u8* buf, size_t buf_len)
 {
         const u8 *tmp;
@@ -147 +147 @@
 }
 
-static int create_private_blob(PRIVATEKEYBLOB *pr_blob, const struct sc_pkcs15_prkey_rsa *key)
+static int create_private_blob(RUPRIVATEKEYBLOB *pr_blob, const struct sc_pkcs15_prkey_rsa *key)
 {
         size_t n;
@@ -213 +213 @@
 }
 
-static int get_sc_pksc15_prkey_rsa(const PRIVATEKEYBLOB *pr_blob, struct sc_pkcs15_prkey_rsa *key)
+static int get_sc_pksc15_prkey_rsa(const RUPRIVATEKEYBLOB *pr_blob, struct sc_pkcs15_prkey_rsa *key)
 {
         static const u8 Exp[3] = { 0x01, 0x00, 0x01 }; /* big endian */
@@ -270 +270 @@
 }
 
-static int private_blob_to_bin(const PRIVATEKEYBLOB *pr_blob, u8 *buf, size_t *buf_len)
+static int private_blob_to_bin(const RUPRIVATEKEYBLOB *pr_blob, u8 *buf, size_t *buf_len)
 {
         size_t len = 2 + sizeof(pr_blob->blobheader) + sizeof(pr_blob->rsapubkey);
@@ -315 +315 @@
 }
 
-static int clean_prkey_private_blob(const PRIVATEKEYBLOB* pr_blob)
+static int clean_prkey_private_blob(const RUPRIVATEKEYBLOB* pr_blob)
 {
         const uint32_t bitlen = pr_blob->rsapubkey.bitlen;
@@ -332 +332 @@
 {
         int ret = -1;
-        PRIVATEKEYBLOB pr_blob;
+        RUPRIVATEKEYBLOB pr_blob;
 
         if (data && key)
@@ -358 +358 @@
 {
         int r = -1;
-        PRIVATEKEYBLOB prkeyblob;
+        RUPRIVATEKEYBLOB prkeyblob;
 
         if (rsa && key && keysize)