Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gabriel Ivăncescu
wine
Commits
a554ff21
Commit
a554ff21
authored
2 years ago
by
Sven Baars
Committed by
Alexandre Julliard
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
bcrypt: Factor out wow64 padding conversion.
parent
c898503e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/bcrypt/gnutls.c
+32
-20
32 additions, 20 deletions
dlls/bcrypt/gnutls.c
with
32 additions
and
20 deletions
dlls/bcrypt/gnutls.c
+
32
−
20
View file @
a554ff21
...
...
@@ -2302,6 +2302,34 @@ struct key32
}
u
;
};
union
padding
{
BCRYPT_PKCS1_PADDING_INFO
pkcs1
;
};
union
padding32
{
struct
{
PTR32
pszAlgId
;
}
pkcs1
;
};
static
union
padding
*
get_padding
(
union
padding32
*
padding32
,
union
padding
*
padding
,
ULONG
flags
)
{
if
(
!
padding32
)
return
NULL
;
switch
(
flags
)
{
case
BCRYPT_PAD_PKCS1
:
padding
->
pkcs1
.
pszAlgId
=
ULongToPtr
(
padding32
->
pkcs1
.
pszAlgId
);
return
padding
;
default:
break
;
}
return
NULL
;
}
static
struct
key
*
get_symmetric_key
(
struct
key32
*
key32
,
struct
key
*
key
)
{
key
->
hdr
=
key32
->
hdr
;
...
...
@@ -2576,12 +2604,12 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )
NTSTATUS
ret
;
struct
key
key
;
BCRYPT_PKCS1_PADDING_INFO
padding
;
union
padding
padding
;
struct
key32
*
key32
=
ULongToPtr
(
params32
->
key
);
struct
key_asymmetric_sign_params
params
=
{
get_asymmetric_key
(
key32
,
&
key
),
NULL
,
/* padding */
get_padding
(
ULongToPtr
(
params32
->
padding
),
&
padding
,
params32
->
flags
),
ULongToPtr
(
params32
->
input
),
params32
->
input_len
,
ULongToPtr
(
params32
->
output
),
...
...
@@ -2590,14 +2618,6 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )
params32
->
flags
};
if
(
params32
->
flags
&
BCRYPT_PAD_PKCS1
)
{
PTR32
*
info
=
ULongToPtr
(
params32
->
padding
);
if
(
!
info
)
return
STATUS_INVALID_PARAMETER
;
padding
.
pszAlgId
=
ULongToPtr
(
*
info
);
params
.
padding
=
&
padding
;
}
ret
=
key_asymmetric_sign
(
&
params
);
put_asymmetric_key32
(
&
key
,
key32
);
return
ret
;
...
...
@@ -2618,12 +2638,12 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )
NTSTATUS
ret
;
struct
key
key
;
BCRYPT_PKCS1_PADDING_INFO
padding
;
union
padding
padding
;
struct
key32
*
key32
=
ULongToPtr
(
params32
->
key
);
struct
key_asymmetric_verify_params
params
=
{
get_asymmetric_key
(
key32
,
&
key
),
NULL
,
/* padding */
get_padding
(
ULongToPtr
(
params32
->
padding
),
&
padding
,
params32
->
flags
),
ULongToPtr
(
params32
->
hash
),
params32
->
hash_len
,
ULongToPtr
(
params32
->
signature
),
...
...
@@ -2631,14 +2651,6 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )
params32
->
flags
};
if
(
params32
->
flags
&
BCRYPT_PAD_PKCS1
)
{
PTR32
*
info
=
ULongToPtr
(
params32
->
padding
);
if
(
!
info
)
return
STATUS_INVALID_PARAMETER
;
padding
.
pszAlgId
=
ULongToPtr
(
*
info
);
params
.
padding
=
&
padding
;
}
ret
=
key_asymmetric_verify
(
&
params
);
put_asymmetric_key32
(
&
key
,
key32
);
return
ret
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment