Juan Lang : crypt32: Get rid of attribute certs from signed info, they' re not supported anyway.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 014467031e3a6f18a3c214c2aab1d95ff49584d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=014467031e3a6f18a3c214c2aa...

Author: Juan Lang 
Date:   Mon Jul 30 12:09:39 2007 -0700

crypt32: Get rid of attribute certs from signed info, they're not supported anyway.

---

dlls/crypt32/crypt32_private.h |    2 --
 dlls/crypt32/encode.c          |    2 --
 dlls/crypt32/msg.c             |   15 ++++++---------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h
index 14f081f..a7bd2b3 100644
--- a/dlls/crypt32/crypt32_private.h
+++ b/dlls/crypt32/crypt32_private.h
@@ -89,8 +89,6 @@ typedef struct _CRYPT_SIGNED_INFO
     PCERT_BLOB         rgCertEncoded;
     DWORD              cCrlEncoded;
     PCRL_BLOB          rgCrlEncoded;
-    DWORD              cAttrCertEncoded;
-    PCERT_BLOB         rgAttrCertEncoded;
     CRYPT_CONTENT_INFO content;
     DWORD              cSignerInfo;
     PCMSG_SIGNER_INFO  rgSignerInfo;
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index b653a0d..f01b322 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -3255,8 +3255,6 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData,
     DWORD cItem = 1, cSwapped = 0;
     BOOL ret = TRUE;

-    if (signedInfo->cAttrCertEncoded)
-        FIXME("unimplemented for attr certs\n");
     if (signedInfo->cSignerInfo)
     {
         digestAlgorithmsSet.cItems = signedInfo->cSignerInfo;
diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c
index 388821b..54f0636 100644
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -1833,21 +1833,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
         break;
     case CMSG_ATTR_CERT_COUNT_PARAM:
         if (msg->u.signedInfo)
+        {
+            DWORD attrCertCount = 0;
+
             ret = CRYPT_CopyParam(pvData, pcbData,
-             &msg->u.signedInfo->cAttrCertEncoded, sizeof(DWORD));
+             &attrCertCount, sizeof(DWORD));
+        }
         else
             SetLastError(CRYPT_E_INVALID_MSG_TYPE);
         break;
     case CMSG_ATTR_CERT_PARAM:
         if (msg->u.signedInfo)
-        {
-            if (dwIndex >= msg->u.signedInfo->cAttrCertEncoded)
-                SetLastError(CRYPT_E_INVALID_INDEX);
-            else
-                ret = CRYPT_CopyParam(pvData, pcbData,
-                 msg->u.signedInfo->rgAttrCertEncoded[dwIndex].pbData,
-                 msg->u.signedInfo->rgAttrCertEncoded[dwIndex].cbData);
-        }
+            SetLastError(CRYPT_E_INVALID_INDEX);
         else
             SetLastError(CRYPT_E_INVALID_MSG_TYPE);
         break;