Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
d3c48225
Commit
d3c48225
authored
Oct 13, 2009
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 13, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rsaenh: Fix the accepted RC2 key length, based on a test case by Dan Kegel.
parent
c7992a8d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
4 deletions
+50
-4
crypt.c
dlls/advapi32/tests/crypt.c
+46
-3
rsaenh.c
dlls/rsaenh/rsaenh.c
+1
-1
wincrypt.h
include/wincrypt.h
+3
-0
No files found.
dlls/advapi32/tests/crypt.c
View file @
d3c48225
...
...
@@ -933,17 +933,60 @@ static void test_machine_guid(void)
RegCloseKey
(
key
);
}
#define key_length 16
static
const
unsigned
char
key
[
key_length
]
=
{
0xbf
,
0xf6
,
0x83
,
0x4b
,
0x3e
,
0xa3
,
0x23
,
0xdd
,
0x96
,
0x78
,
0x70
,
0x8e
,
0xa1
,
0x9d
,
0x3b
,
0x40
};
static
void
hashtest
(
void
)
{
struct
KeyBlob
{
BLOBHEADER
header
;
DWORD
key_size
;
BYTE
key_data
[
key_length
];
}
key_blob
;
HCRYPTPROV
provider
;
HCRYPTKEY
hkey
;
BOOL
ret
;
SetLastError
(
0xdeadbeef
);
ret
=
pCryptAcquireContextA
(
&
provider
,
NULL
,
NULL
,
PROV_RSA_FULL
,
CRYPT_VERIFYCONTEXT
);
ok
(
ret
,
"CryptAcquireContext error %u
\n
"
,
GetLastError
());
key_blob
.
header
.
bType
=
PLAINTEXTKEYBLOB
;
key_blob
.
header
.
bVersion
=
CUR_BLOB_VERSION
;
key_blob
.
header
.
reserved
=
0
;
key_blob
.
header
.
aiKeyAlg
=
CALG_RC2
;
key_blob
.
key_size
=
key_length
;
memcpy
(
key_blob
.
key_data
,
key
,
key_length
);
SetLastError
(
0xdeadbeef
);
ret
=
pCryptImportKey
(
provider
,
(
BYTE
*
)
&
key_blob
,
sizeof
(
BLOBHEADER
)
+
sizeof
(
DWORD
)
+
key_length
,
0
,
CRYPT_IPSEC_HMAC_KEY
,
&
hkey
);
ok
(
ret
,
"CryptImportKey error %u
\n
"
,
GetLastError
());
pCryptDestroyKey
(
hkey
);
pCryptReleaseContext
(
provider
,
0
);
}
START_TEST
(
crypt
)
{
init_function_pointers
();
if
(
pCryptAcquireContextA
&&
pCryptReleaseContext
)
{
init_function_pointers
();
if
(
pCryptAcquireContextA
&&
pCryptReleaseContext
)
{
hashtest
();
init_environment
();
test_acquire_context
();
test_incorrect_api_usage
();
test_verify_sig
();
test_machine_guid
();
clean_up_environment
();
}
}
test_enum_providers
();
test_enum_provider_types
();
...
...
dlls/rsaenh/rsaenh.c
View file @
d3c48225
...
...
@@ -159,7 +159,7 @@ typedef struct tagKEYCONTAINER
static
const
PROV_ENUMALGS_EX
aProvEnumAlgsEx
[
5
][
RSAENH_MAX_ENUMALGS
+
1
]
=
{
{
{
CALG_RC2
,
40
,
40
,
56
,
0
,
4
,
"RC2"
,
24
,
"RSA Data Security's RC2"
},
{
CALG_RC2
,
40
,
5
,
128
,
0
,
4
,
"RC2"
,
24
,
"RSA Data Security's RC2"
},
{
CALG_RC4
,
40
,
40
,
56
,
0
,
4
,
"RC4"
,
24
,
"RSA Data Security's RC4"
},
{
CALG_DES
,
56
,
56
,
56
,
0
,
4
,
"DES"
,
31
,
"Data Encryption Standard (DES)"
},
{
CALG_SHA
,
160
,
160
,
160
,
CRYPT_FLAG_SIGNING
,
6
,
"SHA-1"
,
30
,
"Secure Hash Algorithm (SHA-1)"
},
...
...
include/wincrypt.h
View file @
d3c48225
...
...
@@ -80,6 +80,9 @@ typedef struct _SCHANNEL_ALG {
DWORD
dwReserved
;
}
SCHANNEL_ALG
,
*
PSCHANNEL_ALG
;
#define CRYPT_IPSEC_HMAC_KEY 0x0100
typedef
struct
_HMAC_INFO
{
ALG_ID
HashAlgid
;
BYTE
*
pbInnerString
;
...
...
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