Juan Lang : crypt32: Use internal decode int function a couple more places.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 205c733b1309f0291bcaa2b0a0027ac8257128af
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=205c733b1309f0291bcaa2b0a0...

Author: Juan Lang 
Date:   Mon Sep 17 17:05:34 2007 -0700

crypt32: Use internal decode int function a couple more places.

---

dlls/crypt32/decode.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index 02bb308..0d38efd 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -115,6 +115,8 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType,
 static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo);
+static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded,
+ DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded);
 /* Like CRYPT_AsnDecodeInteger, but assumes the CRYPT_INTEGER_BLOB's pbData
  * member has been initialized, doesn't do exception handling, and doesn't do
  * memory allocation.  Also doesn't check tag, assumes the caller has checked
@@ -844,9 +846,8 @@ static BOOL WINAPI CRYPT_AsnDecodeCertVersion(DWORD dwCertEncodingType,
     {
         BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]);

-        ret = CRYPT_AsnDecodeInt(dwCertEncodingType, X509_INTEGER,
-         pbEncoded + 1 + lenBytes, dataLen, dwFlags, pDecodePara,
-         pvStructInfo, pcbStructInfo);
+        ret = CRYPT_AsnDecodeIntInternal(pbEncoded + 1 + lenBytes, dataLen,
+         dwFlags, pvStructInfo, pcbStructInfo, NULL);
     }
     return ret;
 }
@@ -2670,9 +2671,8 @@ static BOOL WINAPI CRYPT_AsnDecodePathLenConstraint(DWORD dwCertEncodingType,
                  (struct PATH_LEN_CONSTRAINT *)pvStructInfo;
                 DWORD size = sizeof(constraint->dwPathLenConstraint);

-                ret = CRYPT_AsnDecodeInt(dwCertEncodingType, X509_INTEGER,
-                 pbEncoded, cbEncoded, 0, NULL,
-                 &constraint->dwPathLenConstraint, &size);
+                ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, 0,
+                 &constraint->dwPathLenConstraint, &size, NULL);
                 if (ret)
                     constraint->fPathLenConstraint = TRUE;
                 TRACE("got an int, dwPathLenConstraint is %d\n",