Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
4f815c7d
Commit
4f815c7d
authored
Oct 14, 2009
by
Juan Lang
Committed by
Alexandre Julliard
Oct 15, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
crypt32: Convert internal callers of CRYPT_AsnDecodeArray to call CRYPT_AsnDecodeArrayNoAlloc.
parent
a8f5934f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
23 deletions
+11
-23
decode.c
dlls/crypt32/decode.c
+11
-23
No files found.
dlls/crypt32/decode.c
View file @
4f815c7d
...
@@ -2062,11 +2062,9 @@ static BOOL CRYPT_AsnDecodeRdn(const BYTE *pbEncoded, DWORD cbEncoded,
...
@@ -2062,11 +2062,9 @@ static BOOL CRYPT_AsnDecodeRdn(const BYTE *pbEncoded, DWORD cbEncoded,
sizeof
(
CERT_RDN
),
sizeof
(
CERT_RDN
),
CRYPT_AsnDecodeRdnAttr
,
sizeof
(
CERT_RDN_ATTR
),
TRUE
,
CRYPT_AsnDecodeRdnAttr
,
sizeof
(
CERT_RDN_ATTR
),
TRUE
,
offsetof
(
CERT_RDN_ATTR
,
pszObjId
)
};
offsetof
(
CERT_RDN_ATTR
,
pszObjId
)
};
PCERT_RDN
rdn
=
pvStructInfo
;
ret
=
CRYPT_AsnDecodeArray
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
ret
=
CRYPT_AsnDecodeArrayNoAlloc
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
NULL
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
);
rdn
?
rdn
->
rgRDNAttr
:
NULL
);
return
ret
;
return
ret
;
}
}
...
@@ -2138,11 +2136,9 @@ static BOOL CRYPT_AsnDecodeUnicodeRdn(const BYTE *pbEncoded, DWORD cbEncoded,
...
@@ -2138,11 +2136,9 @@ static BOOL CRYPT_AsnDecodeUnicodeRdn(const BYTE *pbEncoded, DWORD cbEncoded,
sizeof
(
CERT_RDN
),
sizeof
(
CERT_RDN
),
CRYPT_AsnDecodeUnicodeRdnAttr
,
sizeof
(
CERT_RDN_ATTR
),
TRUE
,
CRYPT_AsnDecodeUnicodeRdnAttr
,
sizeof
(
CERT_RDN_ATTR
),
TRUE
,
offsetof
(
CERT_RDN_ATTR
,
pszObjId
)
};
offsetof
(
CERT_RDN_ATTR
,
pszObjId
)
};
PCERT_RDN
rdn
=
pvStructInfo
;
ret
=
CRYPT_AsnDecodeArray
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
ret
=
CRYPT_AsnDecodeArrayNoAlloc
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
NULL
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
);
rdn
?
rdn
->
rgRDNAttr
:
NULL
);
return
ret
;
return
ret
;
}
}
...
@@ -2284,11 +2280,9 @@ static BOOL CRYPT_AsnDecodeCTLUsage(const BYTE *pbEncoded, DWORD cbEncoded,
...
@@ -2284,11 +2280,9 @@ static BOOL CRYPT_AsnDecodeCTLUsage(const BYTE *pbEncoded, DWORD cbEncoded,
offsetof
(
CTL_USAGE
,
rgpszUsageIdentifier
),
offsetof
(
CTL_USAGE
,
rgpszUsageIdentifier
),
sizeof
(
CTL_USAGE
),
sizeof
(
CTL_USAGE
),
CRYPT_AsnDecodeOidInternal
,
sizeof
(
LPSTR
),
TRUE
,
0
};
CRYPT_AsnDecodeOidInternal
,
sizeof
(
LPSTR
),
TRUE
,
0
};
CTL_USAGE
*
usage
=
pvStructInfo
;
ret
=
CRYPT_AsnDecodeArray
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
ret
=
CRYPT_AsnDecodeArrayNoAlloc
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
NULL
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
);
usage
?
usage
->
rgpszUsageIdentifier
:
NULL
);
return
ret
;
return
ret
;
}
}
...
@@ -2952,12 +2946,10 @@ static BOOL CRYPT_AsnDecodePKCSAttributesInternal(const BYTE *pbEncoded,
...
@@ -2952,12 +2946,10 @@ static BOOL CRYPT_AsnDecodePKCSAttributesInternal(const BYTE *pbEncoded,
sizeof
(
CRYPT_ATTRIBUTES
),
sizeof
(
CRYPT_ATTRIBUTES
),
CRYPT_AsnDecodePKCSAttributeInternal
,
sizeof
(
CRYPT_ATTRIBUTE
),
TRUE
,
CRYPT_AsnDecodePKCSAttributeInternal
,
sizeof
(
CRYPT_ATTRIBUTE
),
TRUE
,
offsetof
(
CRYPT_ATTRIBUTE
,
pszObjId
)
};
offsetof
(
CRYPT_ATTRIBUTE
,
pszObjId
)
};
PCRYPT_ATTRIBUTES
attrs
=
pvStructInfo
;
BOOL
ret
;
BOOL
ret
;
ret
=
CRYPT_AsnDecodeArray
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
ret
=
CRYPT_AsnDecodeArrayNoAlloc
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
NULL
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
,
attrs
?
attrs
->
rgAttr
:
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
);
NULL
);
return
ret
;
return
ret
;
}
}
...
@@ -3265,23 +3257,19 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded,
...
@@ -3265,23 +3257,19 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded,
DWORD
cbEncoded
,
DWORD
dwFlags
,
void
*
pvStructInfo
,
DWORD
*
pcbStructInfo
,
DWORD
cbEncoded
,
DWORD
dwFlags
,
void
*
pvStructInfo
,
DWORD
*
pcbStructInfo
,
DWORD
*
pcbDecoded
)
DWORD
*
pcbDecoded
)
{
{
BOOL
ret
=
TRUE
;
BOOL
ret
;
struct
AsnArrayDescriptor
arrayDesc
=
{
0
,
struct
AsnArrayDescriptor
arrayDesc
=
{
0
,
offsetof
(
CERT_ALT_NAME_INFO
,
cAltEntry
),
offsetof
(
CERT_ALT_NAME_INFO
,
cAltEntry
),
offsetof
(
CERT_ALT_NAME_INFO
,
rgAltEntry
),
offsetof
(
CERT_ALT_NAME_INFO
,
rgAltEntry
),
sizeof
(
CERT_ALT_NAME_INFO
),
sizeof
(
CERT_ALT_NAME_INFO
),
CRYPT_AsnDecodeAltNameEntry
,
sizeof
(
CERT_ALT_NAME_ENTRY
),
TRUE
,
CRYPT_AsnDecodeAltNameEntry
,
sizeof
(
CERT_ALT_NAME_ENTRY
),
TRUE
,
offsetof
(
CERT_ALT_NAME_ENTRY
,
u
.
pwszURL
)
};
offsetof
(
CERT_ALT_NAME_ENTRY
,
u
.
pwszURL
)
};
PCERT_ALT_NAME_INFO
info
=
pvStructInfo
;
TRACE
(
"%p, %d, %08x, %p, %d, %p
\n
"
,
pbEncoded
,
cbEncoded
,
dwFlags
,
TRACE
(
"%p, %d, %08x, %p, %d, %p
\n
"
,
pbEncoded
,
cbEncoded
,
dwFlags
,
pvStructInfo
,
*
pcbStructInfo
,
pcbDecoded
);
pvStructInfo
,
*
pcbStructInfo
,
pcbDecoded
);
if
(
info
)
ret
=
CRYPT_AsnDecodeArrayNoAlloc
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
TRACE
(
"info->rgAltEntry is %p
\n
"
,
info
->
rgAltEntry
);
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
);
ret
=
CRYPT_AsnDecodeArray
(
&
arrayDesc
,
pbEncoded
,
cbEncoded
,
dwFlags
,
NULL
,
pvStructInfo
,
pcbStructInfo
,
pcbDecoded
,
info
?
info
->
rgAltEntry
:
NULL
);
return
ret
;
return
ret
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment