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
c7e0f923
Commit
c7e0f923
authored
Sep 12, 2022
by
Hans Leidekker
Committed by
Alexandre Julliard
Sep 13, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dssenh: Use BCrypt algorithm pseudo-handles.
parent
7780caf4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
25 deletions
+7
-25
main.c
dlls/dssenh/main.c
+7
-25
No files found.
dlls/dssenh/main.c
View file @
c7e0f923
...
@@ -40,7 +40,6 @@ struct key
...
@@ -40,7 +40,6 @@ struct key
DWORD
magic
;
DWORD
magic
;
DWORD
algid
;
DWORD
algid
;
DWORD
flags
;
DWORD
flags
;
BCRYPT_ALG_HANDLE
alg_handle
;
BCRYPT_KEY_HANDLE
handle
;
BCRYPT_KEY_HANDLE
handle
;
};
};
...
@@ -139,13 +138,11 @@ static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec )
...
@@ -139,13 +138,11 @@ static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec )
static
struct
key
*
create_key
(
ALG_ID
algid
,
DWORD
flags
)
static
struct
key
*
create_key
(
ALG_ID
algid
,
DWORD
flags
)
{
{
struct
key
*
ret
;
struct
key
*
ret
;
const
WCHAR
*
alg
;
switch
(
algid
)
switch
(
algid
)
{
{
case
AT_SIGNATURE
:
case
AT_SIGNATURE
:
case
CALG_DSS_SIGN
:
case
CALG_DSS_SIGN
:
alg
=
BCRYPT_DSA_ALGORITHM
;
break
;
break
;
default:
default:
...
@@ -158,11 +155,6 @@ static struct key *create_key( ALG_ID algid, DWORD flags )
...
@@ -158,11 +155,6 @@ static struct key *create_key( ALG_ID algid, DWORD flags )
ret
->
magic
=
MAGIC_KEY
;
ret
->
magic
=
MAGIC_KEY
;
ret
->
algid
=
algid
;
ret
->
algid
=
algid
;
ret
->
flags
=
flags
;
ret
->
flags
=
flags
;
if
(
BCryptOpenAlgorithmProvider
(
&
ret
->
alg_handle
,
alg
,
MS_PRIMITIVE_PROVIDER
,
0
))
{
free
(
ret
);
return
NULL
;
}
return
ret
;
return
ret
;
}
}
...
@@ -170,7 +162,6 @@ static void destroy_key( struct key *key )
...
@@ -170,7 +162,6 @@ static void destroy_key( struct key *key )
{
{
if
(
!
key
)
return
;
if
(
!
key
)
return
;
BCryptDestroyKey
(
key
->
handle
);
BCryptDestroyKey
(
key
->
handle
);
BCryptCloseAlgorithmProvider
(
key
->
alg_handle
,
0
);
key
->
magic
=
0
;
key
->
magic
=
0
;
free
(
key
);
free
(
key
);
}
}
...
@@ -181,7 +172,7 @@ static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len )
...
@@ -181,7 +172,7 @@ static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len )
if
(
!
(
ret
=
create_key
(
keyspec
,
0
)))
return
NULL
;
if
(
!
(
ret
=
create_key
(
keyspec
,
0
)))
return
NULL
;
if
(
BCryptImportKeyPair
(
ret
->
alg_handle
,
NULL
,
LEGACY_DSA_V2_PRIVATE_BLOB
,
&
ret
->
handle
,
data
,
len
,
0
))
if
(
BCryptImportKeyPair
(
BCRYPT_DSA_ALG_HANDLE
,
NULL
,
LEGACY_DSA_V2_PRIVATE_BLOB
,
&
ret
->
handle
,
data
,
len
,
0
))
{
{
WARN
(
"failed to import key
\n
"
);
WARN
(
"failed to import key
\n
"
);
destroy_key
(
ret
);
destroy_key
(
ret
);
...
@@ -404,7 +395,7 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle
...
@@ -404,7 +395,7 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle
if
(
!
(
key
=
create_key
(
algid
,
flags
)))
return
FALSE
;
if
(
!
(
key
=
create_key
(
algid
,
flags
)))
return
FALSE
;
if
((
status
=
BCryptGenerateKeyPair
(
key
->
alg_handle
,
&
key
->
handle
,
bitlen
,
0
)))
if
((
status
=
BCryptGenerateKeyPair
(
BCRYPT_DSA_ALG_HANDLE
,
&
key
->
handle
,
bitlen
,
0
)))
{
{
ERR
(
"failed to generate key %08lx
\n
"
,
status
);
ERR
(
"failed to generate key %08lx
\n
"
,
status
);
destroy_key
(
key
);
destroy_key
(
key
);
...
@@ -517,7 +508,7 @@ static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BY
...
@@ -517,7 +508,7 @@ static BOOL import_key_dss2( struct container *container, ALG_ID algid, const BY
if
(
!
(
key
=
create_key
(
CALG_DSS_SIGN
,
flags
)))
return
FALSE
;
if
(
!
(
key
=
create_key
(
CALG_DSS_SIGN
,
flags
)))
return
FALSE
;
if
((
status
=
BCryptImportKeyPair
(
key
->
alg_handle
,
NULL
,
type
,
&
key
->
handle
,
(
UCHAR
*
)
data
,
len
,
0
)))
if
((
status
=
BCryptImportKeyPair
(
BCRYPT_DSA_ALG_HANDLE
,
NULL
,
type
,
&
key
->
handle
,
(
UCHAR
*
)
data
,
len
,
0
)))
{
{
TRACE
(
"failed to import key %08lx
\n
"
,
status
);
TRACE
(
"failed to import key %08lx
\n
"
,
status
);
destroy_key
(
key
);
destroy_key
(
key
);
...
@@ -624,8 +615,8 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY
...
@@ -624,8 +615,8 @@ static BOOL import_key_dss3( struct container *container, ALG_ID algid, const BY
dst
+=
blob
->
cbKey
;
dst
+=
blob
->
cbKey
;
for
(
i
=
0
;
i
<
blob
->
cbKey
;
i
++
)
dst
[
i
]
=
src
[
blob
->
cbKey
-
i
-
1
];
for
(
i
=
0
;
i
<
blob
->
cbKey
;
i
++
)
dst
[
i
]
=
src
[
blob
->
cbKey
-
i
-
1
];
if
((
status
=
BCryptImportKeyPair
(
key
->
alg_handle
,
NULL
,
BCRYPT_DSA_PUBLIC_BLOB
,
&
key
->
handle
,
(
UCHAR
*
)
blob
,
if
((
status
=
BCryptImportKeyPair
(
BCRYPT_DSA_ALG_HANDLE
,
NULL
,
BCRYPT_DSA_PUBLIC_BLOB
,
&
key
->
handle
,
size
,
0
)))
(
UCHAR
*
)
blob
,
size
,
0
)))
{
{
WARN
(
"failed to import key %08lx
\n
"
,
status
);
WARN
(
"failed to import key %08lx
\n
"
,
status
);
destroy_key
(
key
);
destroy_key
(
key
);
...
@@ -771,18 +762,17 @@ static struct hash *create_hash( ALG_ID algid )
...
@@ -771,18 +762,17 @@ static struct hash *create_hash( ALG_ID algid )
{
{
struct
hash
*
ret
;
struct
hash
*
ret
;
BCRYPT_ALG_HANDLE
alg_handle
;
BCRYPT_ALG_HANDLE
alg_handle
;
const
WCHAR
*
alg
;
DWORD
len
;
DWORD
len
;
switch
(
algid
)
switch
(
algid
)
{
{
case
CALG_MD5
:
case
CALG_MD5
:
alg
=
BCRYPT_MD5_ALGORITHM
;
alg
_handle
=
BCRYPT_MD5_ALG_HANDLE
;
len
=
16
;
len
=
16
;
break
;
break
;
case
CALG_SHA1
:
case
CALG_SHA1
:
alg
=
BCRYPT_SHA1_ALGORITHM
;
alg
_handle
=
BCRYPT_SHA1_ALG_HANDLE
;
len
=
20
;
len
=
20
;
break
;
break
;
...
@@ -795,19 +785,11 @@ static struct hash *create_hash( ALG_ID algid )
...
@@ -795,19 +785,11 @@ static struct hash *create_hash( ALG_ID algid )
ret
->
magic
=
MAGIC_HASH
;
ret
->
magic
=
MAGIC_HASH
;
ret
->
len
=
len
;
ret
->
len
=
len
;
if
(
BCryptOpenAlgorithmProvider
(
&
alg_handle
,
alg
,
MS_PRIMITIVE_PROVIDER
,
0
))
{
free
(
ret
);
return
NULL
;
}
if
(
BCryptCreateHash
(
alg_handle
,
&
ret
->
handle
,
NULL
,
0
,
NULL
,
0
,
0
))
if
(
BCryptCreateHash
(
alg_handle
,
&
ret
->
handle
,
NULL
,
0
,
NULL
,
0
,
0
))
{
{
BCryptCloseAlgorithmProvider
(
alg_handle
,
0
);
free
(
ret
);
free
(
ret
);
return
NULL
;
return
NULL
;
}
}
BCryptCloseAlgorithmProvider
(
alg_handle
,
0
);
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