Changeset 21916 for trunk/src/rsaenh


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/rsaenh/rsaenh.c

    r21494 r21916  
    929929                        RegSetValueExA(hKey, szValueName, 0, REG_BINARY,
    930930                                       blobOut.pbData, blobOut.cbData);
    931                         LocalFree(blobOut.pbData);
     931                        LocalFree((HLOCAL)blobOut.pbData);
    932932                    }
    933933                }
    … …  
    11711171                    ret = RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0,
    11721172                                             phCryptKey);
    1173                     LocalFree(blobOut.pbData);
     1173                    LocalFree((HLOCAL)blobOut.pbData);
    11741174                }
    11751175            }

  • trunk/src/rsaenh/rsaenh.def

    r21494 r21916  
    55EXPORTS
    66
    7 CPAcquireContext = _RSAENH_CPAcquireContext@16 @1
    8 CPCreateHash = _RSAENH_CPCreateHash@20 @2
    9 CPDecrypt = _RSAENH_CPDecrypt@28 @3
    10 CPDeriveKey = _RSAENH_CPDeriveKey@20 @4
    11 CPDestroyHash = _RSAENH_CPDestroyHash@8 @5
    12 CPDestroyKey = _RSAENH_CPDestroyKey@8 @6
    13 CPDuplicateHash = _RSAENH_CPDuplicateHash@20 @7
    14 CPDuplicateKey = _RSAENH_CPDuplicateKey@20 @8
    15 CPEncrypt = _RSAENH_CPEncrypt@32 @9
    16 CPExportKey = _RSAENH_CPExportKey@28 @10
    17 CPGenKey = _RSAENH_CPGenKey@16 @11
    18 CPGenRandom = _RSAENH_CPGenRandom@12 @12
    19 CPGetHashParam = _RSAENH_CPGetHashParam@24 @13
    20 CPGetKeyParam = _RSAENH_CPGetKeyParam@24 @14
    21 CPGetProvParam = _RSAENH_CPGetProvParam@20 @15
    22 CPGetUserKey = _RSAENH_CPGetUserKey@12 @16
    23 CPHashData = _RSAENH_CPHashData@20 @17
    24 CPHashSessionKey = _RSAENH_CPHashSessionKey@16 @18
    25 CPImportKey = _RSAENH_CPImportKey@24 @19
    26 CPReleaseContext = _RSAENH_CPReleaseContext@8 @20
    27 CPSetHashParam = _RSAENH_CPSetHashParam@20 @21
    28 CPSetKeyParam = _RSAENH_CPSetKeyParam@20 @22
    29 CPSetProvParam = _RSAENH_CPSetProvParam@16 @23
    30 CPSignHash = _RSAENH_CPSignHash@28 @24
    31 CPVerifySignature = _RSAENH_CPVerifySignature@28 @25
    32 DllRegisterServer = _DllRegisterServer@0 @26
    33 DllUnregisterServer = _DllUnregisterServer@0 @27
     7CPAcquireContext = "_RSAENH_CPAcquireContext@16" @1
     8CPCreateHash = "_RSAENH_CPCreateHash@20" @2
     9CPDecrypt = "_RSAENH_CPDecrypt@28" @3
     10CPDeriveKey = "_RSAENH_CPDeriveKey@20" @4
     11CPDestroyHash = "_RSAENH_CPDestroyHash@8" @5
     12CPDestroyKey = "_RSAENH_CPDestroyKey@8" @6
     13CPDuplicateHash = "_RSAENH_CPDuplicateHash@20" @7
     14CPDuplicateKey = "_RSAENH_CPDuplicateKey@20" @8
     15CPEncrypt = "_RSAENH_CPEncrypt@32" @9
     16CPExportKey = "_RSAENH_CPExportKey@28" @10
     17CPGenKey = "_RSAENH_CPGenKey@16" @11
     18CPGenRandom = "_RSAENH_CPGenRandom@12" @12
     19CPGetHashParam = "_RSAENH_CPGetHashParam@24" @13
     20CPGetKeyParam = "_RSAENH_CPGetKeyParam@24" @14
     21CPGetProvParam = "_RSAENH_CPGetProvParam@20" @15
     22CPGetUserKey = "_RSAENH_CPGetUserKey@12" @16
     23CPHashData = "_RSAENH_CPHashData@20" @17
     24CPHashSessionKey = "_RSAENH_CPHashSessionKey@16" @18
     25CPImportKey = "_RSAENH_CPImportKey@24" @19
     26CPReleaseContext = "_RSAENH_CPReleaseContext@8" @20
     27CPSetHashParam = "_RSAENH_CPSetHashParam@20" @21
     28CPSetKeyParam = "_RSAENH_CPSetKeyParam@20" @22
     29CPSetProvParam = "_RSAENH_CPSetProvParam@16" @23
     30CPSignHash = "_RSAENH_CPSignHash@28" @24
     31CPVerifySignature = "_RSAENH_CPVerifySignature@28" @25
     32DllRegisterServer = "_DllRegisterServer@0" @26
     33DllUnregisterServer = "_DllUnregisterServer@0" @27
    3434
    3535IMPORTS
    3636
    37 _MD4Final@4 = ADVAPI32.503
    38 _MD5Final@4 = ADVAPI32.506
    39 _MD4Update@12 = ADVAPI32.505
    40 _MD5Update@12 = ADVAPI32.508
    41 _A_SHAInit@4 = ADVAPI32.501
    42 _A_SHAFinal@8 = ADVAPI32.500
    43 _A_SHAUpdate@12 = ADVAPI32.502
    44 _MD4Init@4 = ADVAPI32.504
    45 _MD5Init@4 = ADVAPI32.507
     37"_MD4Final@4" = ADVAPI32.503
     38"_MD5Final@4" = ADVAPI32.506
     39"_MD4Update@12" = ADVAPI32.505
     40"_MD5Update@12" = ADVAPI32.508
     41"_A_SHAInit@4" = ADVAPI32.501
     42"_A_SHAFinal@8" = ADVAPI32.500
     43"_A_SHAUpdate@12" = ADVAPI32.502
     44"_MD4Init@4" = ADVAPI32.504
     45"_MD5Init@4" = ADVAPI32.507
    4646_wsnprintfA = USER32.2100
    47 _SystemFunction036@8 = ADVAPI32.402
     47"_SystemFunction036@8" = ADVAPI32.402
Note: See TracChangeset for help on using the changeset viewer.