lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-20 02:42:09 +03:00
Code Activity

wincng: tidy-ups

Browse Source 
- make `_libssh2_wincng_key_sha_verify` static.

- prefer `unsigned long` over `size_t` in two static functions.

- prefer `ULONG` over `DWORD` to match `BCryptImportKeyPair()`
  and `BCryptGenerateKeyPair()`.

- add a newline.

Closes #1164
This commit is contained in:
Viktor Szakats
2023-08-14 23:23:06 +00:00
parent d43b8d9b0b
commit 7bb669b52a
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/wincng.c
View File

@@ -604,7 +604,7 @@ _libssh2_wincng_hmac_cleanup(_libssh2_wincng_hash_ctx *ctx)
* Windows CNG backend: Key functions * Windows CNG backend: Key functions
*/ */
int static int
_libssh2_wincng_key_sha_verify(_libssh2_wincng_key_ctx *ctx, _libssh2_wincng_key_sha_verify(_libssh2_wincng_key_ctx *ctx,
unsigned long hashlen, unsigned long hashlen,
const unsigned char *sig, const unsigned char *sig,
@@ -864,7 +864,7 @@ _libssh2_wincng_bn_ltob(unsigned char *pbInput,
static int static int
_libssh2_wincng_asn_decode_bn(unsigned char *pbEncoded, _libssh2_wincng_asn_decode_bn(unsigned char *pbEncoded,
size_t cbEncoded, unsigned long cbEncoded,
unsigned char **ppbDecoded, unsigned char **ppbDecoded,
unsigned long *pcbDecoded) unsigned long *pcbDecoded)
{ {
@@ -873,7 +873,7 @@ _libssh2_wincng_asn_decode_bn(unsigned char *pbEncoded,
unsigned long cbDecoded = 0, cbInteger; unsigned long cbDecoded = 0, cbInteger;
int ret; int ret;
ret = _libssh2_wincng_asn_decode(pbEncoded, (unsigned long)cbEncoded, ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded,
X509_MULTI_BYTE_UINT, X509_MULTI_BYTE_UINT,
(void *)&pbInteger, &cbInteger); (void *)&pbInteger, &cbInteger);
if(!ret) { if(!ret) {
@@ -892,7 +892,7 @@ _libssh2_wincng_asn_decode_bn(unsigned char *pbEncoded,
static int static int
_libssh2_wincng_asn_decode_bns(unsigned char *pbEncoded, _libssh2_wincng_asn_decode_bns(unsigned char *pbEncoded,
size_t cbEncoded, unsigned long cbEncoded,
unsigned char ***prpbDecoded, unsigned char ***prpbDecoded,
unsigned long **prcbDecoded, unsigned long **prcbDecoded,
unsigned long *pcbCount) unsigned long *pcbCount)
@@ -903,7 +903,7 @@ _libssh2_wincng_asn_decode_bns(unsigned char *pbEncoded,
unsigned long cbDecoded, *rcbDecoded, index, length; unsigned long cbDecoded, *rcbDecoded, index, length;
int ret; int ret;
ret = _libssh2_wincng_asn_decode(pbEncoded, (unsigned long)cbEncoded, ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded,
X509_SEQUENCE_OF_ANY, X509_SEQUENCE_OF_ANY,
(void *)&pbDecoded, &cbDecoded); (void *)&pbDecoded, &cbDecoded);
if(!ret) { if(!ret) {
@@ -1476,7 +1476,7 @@ _libssh2_wincng_dsa_new_private_parse(libssh2_dsa_ctx **dsa,
(void)session; (void)session;
ret = _libssh2_wincng_asn_decode_bns(pbEncoded, cbEncoded, ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (unsigned long)cbEncoded,
&rpbDecoded, &rcbDecoded, &length); &rpbDecoded, &rcbDecoded, &length);
_libssh2_wincng_safe_free(pbEncoded, cbEncoded); _libssh2_wincng_safe_free(pbEncoded, cbEncoded);
@@ -1681,7 +1681,7 @@ _libssh2_wincng_pub_priv_keyfile_parse(LIBSSH2_SESSION *session,
unsigned long index, offset, length = 0; unsigned long index, offset, length = 0;
int ret; int ret;
ret = _libssh2_wincng_asn_decode_bns(pbEncoded, cbEncoded, ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (unsigned long)cbEncoded,
&rpbDecoded, &rcbDecoded, &length); &rpbDecoded, &rcbDecoded, &length);
_libssh2_wincng_safe_free(pbEncoded, cbEncoded); _libssh2_wincng_safe_free(pbEncoded, cbEncoded);
@@ -2007,6 +2007,7 @@ _libssh2_wincng_cipher_init(_libssh2_cipher_ctx *ctx,
return 0; return 0;
} }
int int
_libssh2_wincng_cipher_crypt(_libssh2_cipher_ctx *ctx, _libssh2_wincng_cipher_crypt(_libssh2_cipher_ctx *ctx,
_libssh2_cipher_type(type), _libssh2_cipher_type(type),
@@ -2414,7 +2415,7 @@ _libssh2_dh_key_pair(_libssh2_dh_ctx *dhctx, _libssh2_bn *public,
* in length. At the time of writing a practical observed group_order * in length. At the time of writing a practical observed group_order
* value is 257, so we need to round down to 8 bytes of length (64/8) * value is 257, so we need to round down to 8 bytes of length (64/8)
* in order for kex to succeed */ * in order for kex to succeed */
DWORD key_length_bytes = max((unsigned long)round_down(group_order, 8), ULONG key_length_bytes = max((unsigned long)round_down(group_order, 8),
max(g->length, p->length)); max(g->length, p->length));
BCRYPT_DH_KEY_BLOB *dh_key_blob; BCRYPT_DH_KEY_BLOB *dh_key_blob;
LPCWSTR key_type; LPCWSTR key_type;
@@ -2599,8 +2600,8 @@ _libssh2_dh_secret(_libssh2_dh_ctx *dhctx, _libssh2_bn *secret,
int status; int status;
unsigned char *start, *end; unsigned char *start, *end;
BCRYPT_DH_KEY_BLOB *public_blob; BCRYPT_DH_KEY_BLOB *public_blob;
DWORD key_length_bytes = max(f->length, dhctx->dh_params->cbKeyLength); ULONG key_length_bytes = max(f->length, dhctx->dh_params->cbKeyLength);
DWORD public_blob_len = (DWORD)(sizeof(*public_blob) + ULONG public_blob_len = (ULONG)(sizeof(*public_blob) +
3 * key_length_bytes); 3 * key_length_bytes);
{ {

9
src/wincng.h
View File

@@ -488,15 +488,6 @@ _libssh2_wincng_hmac_final(_libssh2_wincng_hash_ctx *ctx,
void void
_libssh2_wincng_hmac_cleanup(_libssh2_wincng_hash_ctx *ctx); _libssh2_wincng_hmac_cleanup(_libssh2_wincng_hash_ctx *ctx);
int
_libssh2_wincng_key_sha_verify(_libssh2_wincng_key_ctx *ctx,
unsigned long hashlen,
const unsigned char *sig,
unsigned long sig_len,
const unsigned char *m,
unsigned long m_len,
unsigned long flags);
int int
_libssh2_wincng_rsa_new(libssh2_rsa_ctx **rsa, _libssh2_wincng_rsa_new(libssh2_rsa_ctx **rsa,
const unsigned char *edata, const unsigned char *edata,