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: prefer ULONG/DWORD over unsigned long

Browse Source 
To match with the types used by the `Crypt*()` (uses `DWORD`) and
`BCrypt*()` (uses `ULONG`) Windows APIs.

This patch doesn't change data width or signedness.

Closes #1165
This commit is contained in:
Viktor Szakats
2023-08-15 01:36:48 +00:00
parent 7bb669b52a
commit 186c1d6394
2 changed files with 99 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
src/wincng.c
View File

@@ -461,8 +461,8 @@ _libssh2_wincng_safe_free(void *buf, size_t len)
* if the size of src is smaller than dest then pad the "left" (MSB) * if the size of src is smaller than dest then pad the "left" (MSB)
* end with zeroes and copy the bits into the "right" (LSB) end. */ * end with zeroes and copy the bits into the "right" (LSB) end. */
static void static void
memcpy_with_be_padding(unsigned char *dest, unsigned long dest_len, memcpy_with_be_padding(unsigned char *dest, ULONG dest_len,
unsigned char *src, unsigned long src_len) unsigned char *src, ULONG src_len)
{ {
if(dest_len > src_len) { if(dest_len > src_len) {
memset(dest, 0, dest_len - src_len); memset(dest, 0, dest_len - src_len);
@@ -477,12 +477,12 @@ memcpy_with_be_padding(unsigned char *dest, unsigned long dest_len,
int int
_libssh2_wincng_hash_init(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hash_init(_libssh2_wincng_hash_ctx *ctx,
BCRYPT_ALG_HANDLE hAlg, unsigned long hashlen, BCRYPT_ALG_HANDLE hAlg, ULONG hashlen,
unsigned char *key, unsigned long keylen) unsigned char *key, ULONG keylen)
{ {
BCRYPT_HASH_HANDLE hHash; BCRYPT_HASH_HANDLE hHash;
unsigned char *pbHashObject; unsigned char *pbHashObject;
unsigned long dwHashObject, dwHash, cbData; ULONG dwHashObject, dwHash, cbData;
int ret; int ret;
ret = BCryptGetProperty(hAlg, BCRYPT_HASH_LENGTH, ret = BCryptGetProperty(hAlg, BCRYPT_HASH_LENGTH,
@@ -526,7 +526,7 @@ _libssh2_wincng_hash_init(_libssh2_wincng_hash_ctx *ctx,
int int
_libssh2_wincng_hash_update(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hash_update(_libssh2_wincng_hash_ctx *ctx,
const unsigned char *data, unsigned long datalen) const unsigned char *data, ULONG datalen)
{ {
int ret; int ret;
@@ -554,9 +554,9 @@ _libssh2_wincng_hash_final(_libssh2_wincng_hash_ctx *ctx,
} }
int int
_libssh2_wincng_hash(const unsigned char *data, unsigned long datalen, _libssh2_wincng_hash(const unsigned char *data, ULONG datalen,
BCRYPT_ALG_HANDLE hAlg, BCRYPT_ALG_HANDLE hAlg,
unsigned char *hash, unsigned long hashlen) unsigned char *hash, ULONG hashlen)
{ {
_libssh2_wincng_hash_ctx ctx; _libssh2_wincng_hash_ctx ctx;
int ret; int ret;
@@ -606,18 +606,18 @@ _libssh2_wincng_hmac_cleanup(_libssh2_wincng_hash_ctx *ctx)
static 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, ULONG hashlen,
const unsigned char *sig, const unsigned char *sig,
unsigned long sig_len, ULONG sig_len,
const unsigned char *m, const unsigned char *m,
unsigned long m_len, ULONG m_len,
unsigned long flags) ULONG flags)
{ {
BCRYPT_PKCS1_PADDING_INFO paddingInfoPKCS1; BCRYPT_PKCS1_PADDING_INFO paddingInfoPKCS1;
BCRYPT_ALG_HANDLE hAlgHash; BCRYPT_ALG_HANDLE hAlgHash;
void *pPaddingInfo; void *pPaddingInfo;
unsigned char *data, *hash; unsigned char *data, *hash;
unsigned long datalen; ULONG datalen;
int ret; int ret;
if(hashlen == SHA_DIGEST_LENGTH) { if(hashlen == SHA_DIGEST_LENGTH) {
@@ -785,13 +785,13 @@ _libssh2_wincng_load_private_memory(LIBSSH2_SESSION *session,
static int static int
_libssh2_wincng_asn_decode(unsigned char *pbEncoded, _libssh2_wincng_asn_decode(unsigned char *pbEncoded,
unsigned long cbEncoded, DWORD cbEncoded,
LPCSTR lpszStructType, LPCSTR lpszStructType,
unsigned char **ppbDecoded, unsigned char **ppbDecoded,
unsigned long *pcbDecoded) DWORD *pcbDecoded)
{ {
unsigned char *pbDecoded = NULL; unsigned char *pbDecoded = NULL;
unsigned long cbDecoded = 0; DWORD cbDecoded = 0;
int ret; int ret;
ret = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, ret = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
@@ -825,12 +825,12 @@ _libssh2_wincng_asn_decode(unsigned char *pbEncoded,
static int static int
_libssh2_wincng_bn_ltob(unsigned char *pbInput, _libssh2_wincng_bn_ltob(unsigned char *pbInput,
unsigned long cbInput, DWORD cbInput,
unsigned char **ppbOutput, unsigned char **ppbOutput,
unsigned long *pcbOutput) DWORD *pcbOutput)
{ {
unsigned char *pbOutput; unsigned char *pbOutput;
unsigned long cbOutput, index, offset, length; DWORD cbOutput, index, offset, length;
if(cbInput < 1) { if(cbInput < 1) {
return 0; return 0;
@@ -864,13 +864,13 @@ _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,
unsigned long cbEncoded, DWORD cbEncoded,
unsigned char **ppbDecoded, unsigned char **ppbDecoded,
unsigned long *pcbDecoded) DWORD *pcbDecoded)
{ {
unsigned char *pbDecoded = NULL; unsigned char *pbDecoded = NULL;
PCRYPT_DATA_BLOB pbInteger; PCRYPT_DATA_BLOB pbInteger;
unsigned long cbDecoded = 0, cbInteger; DWORD cbDecoded = 0, cbInteger;
int ret; int ret;
ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded, ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded,
@@ -892,15 +892,15 @@ _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,
unsigned long cbEncoded, DWORD cbEncoded,
unsigned char ***prpbDecoded, unsigned char ***prpbDecoded,
unsigned long **prcbDecoded, DWORD **prcbDecoded,
unsigned long *pcbCount) DWORD *pcbCount)
{ {
PCRYPT_DER_BLOB pBlob; PCRYPT_DER_BLOB pBlob;
unsigned char **rpbDecoded; unsigned char **rpbDecoded;
PCRYPT_SEQUENCE_OF_ANY pbDecoded; PCRYPT_SEQUENCE_OF_ANY pbDecoded;
unsigned long cbDecoded, *rcbDecoded, index, length; DWORD cbDecoded, *rcbDecoded, index, length;
int ret; int ret;
ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded, ret = _libssh2_wincng_asn_decode(pbEncoded, cbEncoded,
@@ -956,11 +956,10 @@ _libssh2_wincng_asn_decode_bns(unsigned char *pbEncoded,
#endif /* HAVE_LIBCRYPT32 */ #endif /* HAVE_LIBCRYPT32 */
#if LIBSSH2_RSA || LIBSSH2_DSA #if LIBSSH2_RSA || LIBSSH2_DSA
static unsigned long static ULONG
_libssh2_wincng_bn_size(const unsigned char *bignum, _libssh2_wincng_bn_size(const unsigned char *bignum, ULONG length)
unsigned long length)
{ {
unsigned long offset; ULONG offset;
if(!bignum) if(!bignum)
return 0; return 0;
@@ -1006,7 +1005,7 @@ _libssh2_wincng_rsa_new(libssh2_rsa_ctx **rsa,
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
BCRYPT_RSAKEY_BLOB *rsakey; BCRYPT_RSAKEY_BLOB *rsakey;
LPCWSTR lpszBlobType; LPCWSTR lpszBlobType;
unsigned long keylen, offset, mlen, p1len = 0, p2len = 0; ULONG keylen, offset, mlen, p1len = 0, p2len = 0;
int ret; int ret;
mlen = max(_libssh2_wincng_bn_size(ndata, nlen), mlen = max(_libssh2_wincng_bn_size(ndata, nlen),
@@ -1136,12 +1135,12 @@ _libssh2_wincng_rsa_new_private_parse(libssh2_rsa_ctx **rsa,
{ {
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
unsigned char *pbStructInfo; unsigned char *pbStructInfo;
unsigned long cbStructInfo; DWORD cbStructInfo;
int ret; int ret;
(void)session; (void)session;
ret = _libssh2_wincng_asn_decode(pbEncoded, (unsigned long)cbEncoded, ret = _libssh2_wincng_asn_decode(pbEncoded, (DWORD)cbEncoded,
PKCS_RSA_PRIVATE_KEY, PKCS_RSA_PRIVATE_KEY,
&pbStructInfo, &cbStructInfo); &pbStructInfo, &cbStructInfo);
@@ -1252,8 +1251,8 @@ _libssh2_wincng_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
size_t m_len) size_t m_len)
{ {
return _libssh2_wincng_key_sha_verify(rsa, SHA_DIGEST_LENGTH, return _libssh2_wincng_key_sha_verify(rsa, SHA_DIGEST_LENGTH,
sig, (unsigned long)sig_len, sig, (ULONG)sig_len,
m, (unsigned long)m_len, m, (ULONG)m_len,
BCRYPT_PAD_PKCS1); BCRYPT_PAD_PKCS1);
} }
#endif #endif
@@ -1267,9 +1266,9 @@ _libssh2_wincng_rsa_sha2_verify(libssh2_rsa_ctx *rsa,
const unsigned char *m, const unsigned char *m,
size_t m_len) size_t m_len)
{ {
return _libssh2_wincng_key_sha_verify(rsa, (unsigned long)hash_len, return _libssh2_wincng_key_sha_verify(rsa, (ULONG)hash_len,
sig, (unsigned long)sig_len, sig, (ULONG)sig_len,
m, (unsigned long)m_len, m, (ULONG)m_len,
BCRYPT_PAD_PKCS1); BCRYPT_PAD_PKCS1);
} }
#endif #endif
@@ -1284,7 +1283,7 @@ _libssh2_wincng_rsa_sha_sign(LIBSSH2_SESSION *session,
{ {
BCRYPT_PKCS1_PADDING_INFO paddingInfo; BCRYPT_PKCS1_PADDING_INFO paddingInfo;
unsigned char *data, *sig; unsigned char *data, *sig;
unsigned long cbData, datalen, siglen; ULONG cbData, datalen, siglen;
int ret; int ret;
if(hash_len == SHA_DIGEST_LENGTH) if(hash_len == SHA_DIGEST_LENGTH)
@@ -1301,7 +1300,7 @@ _libssh2_wincng_rsa_sha_sign(LIBSSH2_SESSION *session,
return -1; return -1;
} }
datalen = (unsigned long)hash_len; datalen = (ULONG)hash_len;
data = malloc(datalen); data = malloc(datalen);
if(!data) { if(!data) {
return -1; return -1;
@@ -1371,7 +1370,7 @@ _libssh2_wincng_dsa_new(libssh2_dsa_ctx **dsa,
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
BCRYPT_DSA_KEY_BLOB *dsakey; BCRYPT_DSA_KEY_BLOB *dsakey;
LPCWSTR lpszBlobType; LPCWSTR lpszBlobType;
unsigned long keylen, offset, length; ULONG keylen, offset, length;
int ret; int ret;
length = max(max(_libssh2_wincng_bn_size(pdata, plen), length = max(max(_libssh2_wincng_bn_size(pdata, plen),
@@ -1471,12 +1470,12 @@ _libssh2_wincng_dsa_new_private_parse(libssh2_dsa_ctx **dsa,
size_t cbEncoded) size_t cbEncoded)
{ {
unsigned char **rpbDecoded; unsigned char **rpbDecoded;
unsigned long *rcbDecoded, index, length; DWORD *rcbDecoded, index, length;
int ret; int ret;
(void)session; (void)session;
ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (unsigned long)cbEncoded, ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (DWORD)cbEncoded,
&rpbDecoded, &rcbDecoded, &length); &rpbDecoded, &rcbDecoded, &length);
_libssh2_wincng_safe_free(pbEncoded, cbEncoded); _libssh2_wincng_safe_free(pbEncoded, cbEncoded);
@@ -1581,7 +1580,7 @@ _libssh2_wincng_dsa_sha1_verify(libssh2_dsa_ctx *dsa,
size_t m_len) size_t m_len)
{ {
return _libssh2_wincng_key_sha_verify(dsa, SHA_DIGEST_LENGTH, sig_fixed, return _libssh2_wincng_key_sha_verify(dsa, SHA_DIGEST_LENGTH, sig_fixed,
40, m, (unsigned long)m_len, 0); 40, m, (ULONG)m_len, 0);
} }
int int
@@ -1591,10 +1590,10 @@ _libssh2_wincng_dsa_sha1_sign(libssh2_dsa_ctx *dsa,
unsigned char *sig_fixed) unsigned char *sig_fixed)
{ {
unsigned char *data, *sig; unsigned char *data, *sig;
unsigned long cbData, datalen, siglen; ULONG cbData, datalen, siglen;
int ret; int ret;
datalen = (unsigned long)hash_len; datalen = (ULONG)hash_len;
data = malloc(datalen); data = malloc(datalen);
if(!data) { if(!data) {
return -1; return -1;
@@ -1650,11 +1649,11 @@ _libssh2_wincng_dsa_free(libssh2_dsa_ctx *dsa)
*/ */
#ifdef HAVE_LIBCRYPT32 #ifdef HAVE_LIBCRYPT32
static unsigned long static DWORD
_libssh2_wincng_pub_priv_write(unsigned char *key, _libssh2_wincng_pub_priv_write(unsigned char *key,
unsigned long offset, DWORD offset,
const unsigned char *bignum, const unsigned char *bignum,
const unsigned long length) const DWORD length)
{ {
_libssh2_htonu32(key + offset, length); _libssh2_htonu32(key + offset, length);
offset += 4; offset += 4;
@@ -1675,13 +1674,13 @@ _libssh2_wincng_pub_priv_keyfile_parse(LIBSSH2_SESSION *session,
size_t cbEncoded) size_t cbEncoded)
{ {
unsigned char **rpbDecoded = NULL; unsigned char **rpbDecoded = NULL;
unsigned long *rcbDecoded = NULL; DWORD *rcbDecoded = NULL;
unsigned char *key = NULL, *mth = NULL; unsigned char *key = NULL, *mth = NULL;
unsigned long keylen = 0, mthlen = 0; DWORD keylen = 0, mthlen = 0;
unsigned long index, offset, length = 0; DWORD index, offset, length = 0;
int ret; int ret;
ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (unsigned long)cbEncoded, ret = _libssh2_wincng_asn_decode_bns(pbEncoded, (DWORD)cbEncoded,
&rpbDecoded, &rcbDecoded, &length); &rpbDecoded, &rcbDecoded, &length);
_libssh2_wincng_safe_free(pbEncoded, cbEncoded); _libssh2_wincng_safe_free(pbEncoded, cbEncoded);
@@ -1917,8 +1916,7 @@ _libssh2_wincng_cipher_init(_libssh2_cipher_ctx *ctx,
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
BCRYPT_KEY_DATA_BLOB_HEADER *header; BCRYPT_KEY_DATA_BLOB_HEADER *header;
unsigned char *pbKeyObject, *pbIV, *pbCtr, *pbIVCopy; unsigned char *pbKeyObject, *pbIV, *pbCtr, *pbIVCopy;
unsigned long dwKeyObject, dwIV, dwCtrLength, dwBlockLength, ULONG dwKeyObject, dwIV, dwCtrLength, dwBlockLength, cbData, keylen;
cbData, keylen;
int ret; int ret;
(void)encrypt; (void)encrypt;
@@ -1945,7 +1943,7 @@ _libssh2_wincng_cipher_init(_libssh2_cipher_ctx *ctx,
} }
keylen = (unsigned long)sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + keylen = (ULONG)sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) +
type.dwKeyLength; type.dwKeyLength;
header = (BCRYPT_KEY_DATA_BLOB_HEADER *)malloc(keylen); header = (BCRYPT_KEY_DATA_BLOB_HEADER *)malloc(keylen);
if(!header) { if(!header) {
@@ -2016,13 +2014,13 @@ _libssh2_wincng_cipher_crypt(_libssh2_cipher_ctx *ctx,
size_t blocklen, int firstlast) size_t blocklen, int firstlast)
{ {
unsigned char *pbOutput, *pbInput; unsigned char *pbOutput, *pbInput;
unsigned long cbOutput, cbInput; ULONG cbOutput, cbInput;
int ret; int ret;
(void)type; (void)type;
(void)firstlast; (void)firstlast;
cbInput = (unsigned long)blocklen; cbInput = (ULONG)blocklen;
if(type.ctrMode) { if(type.ctrMode) {
pbInput = ctx->pbCtr; pbInput = ctx->pbCtr;
@@ -2111,7 +2109,7 @@ _libssh2_wincng_bignum_init(void)
} }
static int static int
_libssh2_wincng_bignum_resize(_libssh2_bn *bn, unsigned long length) _libssh2_wincng_bignum_resize(_libssh2_bn *bn, ULONG length)
{ {
unsigned char *bignum; unsigned char *bignum;
@@ -2139,13 +2137,12 @@ static int
_libssh2_wincng_bignum_rand(_libssh2_bn *rnd, int bits, int top, int bottom) _libssh2_wincng_bignum_rand(_libssh2_bn *rnd, int bits, int top, int bottom)
{ {
unsigned char *bignum; unsigned char *bignum;
unsigned long length; ULONG length;
if(!rnd) if(!rnd)
return -1; return -1;
length = (unsigned long) (ceil(((double)bits) / 8.0) * length = (ULONG) (ceil(((double)bits) / 8.0) * sizeof(unsigned char));
sizeof(unsigned char));
if(_libssh2_wincng_bignum_resize(rnd, length)) if(_libssh2_wincng_bignum_resize(rnd, length))
return -1; return -1;
@@ -2184,7 +2181,7 @@ _libssh2_wincng_bignum_mod_exp(_libssh2_bn *r,
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
BCRYPT_RSAKEY_BLOB *rsakey; BCRYPT_RSAKEY_BLOB *rsakey;
unsigned char *bignum; unsigned char *bignum;
unsigned long keylen, offset, length; ULONG keylen, offset, length;
int ret; int ret;
if(!r || !a || !p || !m) if(!r || !a || !p || !m)
@@ -2252,9 +2249,9 @@ _libssh2_wincng_bignum_mod_exp(_libssh2_bn *r,
} }
int int
_libssh2_wincng_bignum_set_word(_libssh2_bn *bn, unsigned long word) _libssh2_wincng_bignum_set_word(_libssh2_bn *bn, ULONG word)
{ {
unsigned long offset, number, bits, length; ULONG offset, number, bits, length;
if(!bn) if(!bn)
return -1; return -1;
@@ -2265,8 +2262,7 @@ _libssh2_wincng_bignum_set_word(_libssh2_bn *bn, unsigned long word)
bits++; bits++;
bits++; bits++;
length = (unsigned long) (ceil(((double)bits) / 8.0) * length = (ULONG) (ceil(((double)bits) / 8.0) * sizeof(unsigned char));
sizeof(unsigned char));
if(_libssh2_wincng_bignum_resize(bn, length)) if(_libssh2_wincng_bignum_resize(bn, length))
return -1; return -1;
@@ -2276,11 +2272,11 @@ _libssh2_wincng_bignum_set_word(_libssh2_bn *bn, unsigned long word)
return 0; return 0;
} }
unsigned long ULONG
_libssh2_wincng_bignum_bits(const _libssh2_bn *bn) _libssh2_wincng_bignum_bits(const _libssh2_bn *bn)
{ {
unsigned char number; unsigned char number;
unsigned long offset, length, bits; ULONG offset, length, bits;
if(!bn || !bn->bignum || !bn->length) if(!bn || !bn->bignum || !bn->length)
return 0; return 0;
@@ -2300,11 +2296,11 @@ _libssh2_wincng_bignum_bits(const _libssh2_bn *bn)
} }
void void
_libssh2_wincng_bignum_from_bin(_libssh2_bn *bn, unsigned long len, _libssh2_wincng_bignum_from_bin(_libssh2_bn *bn, ULONG len,
const unsigned char *bin) const unsigned char *bin)
{ {
unsigned char *bignum; unsigned char *bignum;
unsigned long offset, length, bits; ULONG offset, length, bits;
if(!bn || !bin || !len) if(!bn || !bin || !len)
return; return;
@@ -2315,8 +2311,7 @@ _libssh2_wincng_bignum_from_bin(_libssh2_bn *bn, unsigned long len,
memcpy(bn->bignum, bin, len); memcpy(bn->bignum, bin, len);
bits = _libssh2_wincng_bignum_bits(bn); bits = _libssh2_wincng_bignum_bits(bn);
length = (unsigned long) (ceil(((double)bits) / 8.0) * length = (ULONG) (ceil(((double)bits) / 8.0) * sizeof(unsigned char));
sizeof(unsigned char));
offset = bn->length - length; offset = bn->length - length;
if(offset > 0) { if(offset > 0) {
@@ -2409,13 +2404,13 @@ _libssh2_dh_key_pair(_libssh2_dh_ctx *dhctx, _libssh2_bn *public,
while(_libssh2_wincng.hAlgDH && hasAlgDHwithKDF != -1) { while(_libssh2_wincng.hAlgDH && hasAlgDHwithKDF != -1) {
BCRYPT_DH_PARAMETER_HEADER *dh_params; BCRYPT_DH_PARAMETER_HEADER *dh_params;
unsigned long dh_params_len; ULONG dh_params_len;
int status; int status;
/* Note that the DH provider requires that keys be multiples of 64 bits /* Note that the DH provider requires that keys be multiples of 64 bits
* 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 */
ULONG key_length_bytes = max((unsigned long)round_down(group_order, 8), ULONG key_length_bytes = max((ULONG)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;
@@ -2429,7 +2424,7 @@ _libssh2_dh_key_pair(_libssh2_dh_ctx *dhctx, _libssh2_bn *public,
return -1; return -1;
} }
dh_params_len = (unsigned long)sizeof(*dh_params) + dh_params_len = (ULONG)sizeof(*dh_params) +
2 * key_length_bytes; 2 * key_length_bytes;
dh_params = (BCRYPT_DH_PARAMETER_HEADER *)malloc(dh_params_len); dh_params = (BCRYPT_DH_PARAMETER_HEADER *)malloc(dh_params_len);
if(!dh_params) { if(!dh_params) {

66
src/wincng.h
View File

@@ -144,8 +144,8 @@ void _libssh2_wincng_free(void);
typedef struct __libssh2_wincng_hash_ctx { typedef struct __libssh2_wincng_hash_ctx {
BCRYPT_HASH_HANDLE hHash; BCRYPT_HASH_HANDLE hHash;
unsigned char *pbHashObject; unsigned char *pbHashObject;
unsigned long dwHashObject; ULONG dwHashObject;
unsigned long cbHash; ULONG cbHash;
} _libssh2_wincng_hash_ctx; } _libssh2_wincng_hash_ctx;
/* /*
@@ -158,8 +158,7 @@ typedef struct __libssh2_wincng_hash_ctx {
SHA_DIGEST_LENGTH, NULL, 0) == 0) SHA_DIGEST_LENGTH, NULL, 0) == 0)
#define libssh2_sha1_update(ctx, data, datalen) \ #define libssh2_sha1_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_sha1_final(ctx, hash) \ #define libssh2_sha1_final(ctx, hash) \
_libssh2_wincng_hash_final(&ctx, hash) _libssh2_wincng_hash_final(&ctx, hash)
#define libssh2_sha1(data, datalen, hash) \ #define libssh2_sha1(data, datalen, hash) \
@@ -172,8 +171,7 @@ typedef struct __libssh2_wincng_hash_ctx {
SHA256_DIGEST_LENGTH, NULL, 0) == 0) SHA256_DIGEST_LENGTH, NULL, 0) == 0)
#define libssh2_sha256_update(ctx, data, datalen) \ #define libssh2_sha256_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_sha256_final(ctx, hash) \ #define libssh2_sha256_final(ctx, hash) \
_libssh2_wincng_hash_final(&ctx, hash) _libssh2_wincng_hash_final(&ctx, hash)
#define libssh2_sha256(data, datalen, hash) \ #define libssh2_sha256(data, datalen, hash) \
@@ -186,8 +184,7 @@ typedef struct __libssh2_wincng_hash_ctx {
SHA384_DIGEST_LENGTH, NULL, 0) == 0) SHA384_DIGEST_LENGTH, NULL, 0) == 0)
#define libssh2_sha384_update(ctx, data, datalen) \ #define libssh2_sha384_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_sha384_final(ctx, hash) \ #define libssh2_sha384_final(ctx, hash) \
_libssh2_wincng_hash_final(&ctx, hash) _libssh2_wincng_hash_final(&ctx, hash)
#define libssh2_sha384(data, datalen, hash) \ #define libssh2_sha384(data, datalen, hash) \
@@ -200,8 +197,7 @@ typedef struct __libssh2_wincng_hash_ctx {
SHA512_DIGEST_LENGTH, NULL, 0) == 0) SHA512_DIGEST_LENGTH, NULL, 0) == 0)
#define libssh2_sha512_update(ctx, data, datalen) \ #define libssh2_sha512_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_sha512_final(ctx, hash) \ #define libssh2_sha512_final(ctx, hash) \
_libssh2_wincng_hash_final(&ctx, hash) _libssh2_wincng_hash_final(&ctx, hash)
#define libssh2_sha512(data, datalen, hash) \ #define libssh2_sha512(data, datalen, hash) \
@@ -214,8 +210,7 @@ typedef struct __libssh2_wincng_hash_ctx {
MD5_DIGEST_LENGTH, NULL, 0) == 0) MD5_DIGEST_LENGTH, NULL, 0) == 0)
#define libssh2_md5_update(ctx, data, datalen) \ #define libssh2_md5_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_md5_final(ctx, hash) \ #define libssh2_md5_final(ctx, hash) \
_libssh2_wincng_hash_final(&ctx, hash) _libssh2_wincng_hash_final(&ctx, hash)
#define libssh2_md5(data, datalen, hash) \ #define libssh2_md5(data, datalen, hash) \
@@ -230,26 +225,21 @@ typedef struct __libssh2_wincng_hash_ctx {
#define libssh2_hmac_ctx_init(ctx) #define libssh2_hmac_ctx_init(ctx)
#define libssh2_hmac_sha1_init(ctx, key, keylen) \ #define libssh2_hmac_sha1_init(ctx, key, keylen) \
_libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA1, \ _libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA1, \
SHA_DIGEST_LENGTH, \ SHA_DIGEST_LENGTH, key, (ULONG) keylen)
key, (unsigned long) keylen)
#define libssh2_hmac_md5_init(ctx, key, keylen) \ #define libssh2_hmac_md5_init(ctx, key, keylen) \
_libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacMD5, \ _libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacMD5, \
MD5_DIGEST_LENGTH, \ MD5_DIGEST_LENGTH, key, (ULONG) keylen)
key, (unsigned long) keylen)
#define libssh2_hmac_ripemd160_init(ctx, key, keylen) #define libssh2_hmac_ripemd160_init(ctx, key, keylen)
/* not implemented */ /* not implemented */
#define libssh2_hmac_sha256_init(ctx, key, keylen) \ #define libssh2_hmac_sha256_init(ctx, key, keylen) \
_libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA256, \ _libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA256, \
SHA256_DIGEST_LENGTH, \ SHA256_DIGEST_LENGTH, key, (ULONG) keylen)
key, (unsigned long) keylen)
#define libssh2_hmac_sha512_init(ctx, key, keylen) \ #define libssh2_hmac_sha512_init(ctx, key, keylen) \
_libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA512, \ _libssh2_wincng_hash_init(ctx, _libssh2_wincng.hAlgHmacSHA512, \
SHA512_DIGEST_LENGTH, \ SHA512_DIGEST_LENGTH, key, (ULONG) keylen)
key, (unsigned long) keylen)
#define libssh2_hmac_update(ctx, data, datalen) \ #define libssh2_hmac_update(ctx, data, datalen) \
_libssh2_wincng_hash_update(&ctx, \ _libssh2_wincng_hash_update(&ctx, \
(const unsigned char *) data, \ (const unsigned char *) data, (ULONG) datalen)
(unsigned long) datalen)
#define libssh2_hmac_final(ctx, hash) \ #define libssh2_hmac_final(ctx, hash) \
_libssh2_wincng_hmac_final(&ctx, hash) _libssh2_wincng_hmac_final(&ctx, hash)
#define libssh2_hmac_cleanup(ctx) \ #define libssh2_hmac_cleanup(ctx) \
@@ -264,7 +254,7 @@ typedef struct __libssh2_wincng_hash_ctx {
typedef struct __libssh2_wincng_key_ctx { typedef struct __libssh2_wincng_key_ctx {
BCRYPT_KEY_HANDLE hKey; BCRYPT_KEY_HANDLE hKey;
void *pbKeyObject; void *pbKeyObject;
unsigned long cbKeyObject; DWORD cbKeyObject;
} _libssh2_wincng_key_ctx; } _libssh2_wincng_key_ctx;
@@ -343,10 +333,10 @@ struct _libssh2_wincng_cipher_ctx {
unsigned char *pbKeyObject; unsigned char *pbKeyObject;
unsigned char *pbIV; unsigned char *pbIV;
unsigned char *pbCtr; unsigned char *pbCtr;
unsigned long dwKeyObject; ULONG dwKeyObject;
unsigned long dwIV; ULONG dwIV;
unsigned long dwBlockLength; ULONG dwBlockLength;
unsigned long dwCtrLength; ULONG dwCtrLength;
}; };
#define _libssh2_cipher_ctx struct _libssh2_wincng_cipher_ctx #define _libssh2_cipher_ctx struct _libssh2_wincng_cipher_ctx
@@ -357,7 +347,7 @@ struct _libssh2_wincng_cipher_ctx {
struct _libssh2_wincng_cipher_type { struct _libssh2_wincng_cipher_type {
BCRYPT_ALG_HANDLE *phAlg; BCRYPT_ALG_HANDLE *phAlg;
unsigned long dwKeyLength; ULONG dwKeyLength;
int useIV; /* TODO: Convert to bool when a C89 compatible bool type int useIV; /* TODO: Convert to bool when a C89 compatible bool type
is defined */ is defined */
int ctrMode; int ctrMode;
@@ -402,7 +392,7 @@ struct _libssh2_wincng_cipher_type {
struct _libssh2_wincng_bignum { struct _libssh2_wincng_bignum {
unsigned char *bignum; unsigned char *bignum;
unsigned long length; ULONG length;
}; };
#define _libssh2_bn struct _libssh2_wincng_bignum #define _libssh2_bn struct _libssh2_wincng_bignum
@@ -420,7 +410,7 @@ _libssh2_bn *_libssh2_wincng_bignum_init(void);
#define _libssh2_bn_set_word(bn, word) \ #define _libssh2_bn_set_word(bn, word) \
_libssh2_wincng_bignum_set_word(bn, word) _libssh2_wincng_bignum_set_word(bn, word)
#define _libssh2_bn_from_bin(bn, len, bin) \ #define _libssh2_bn_from_bin(bn, len, bin) \
_libssh2_wincng_bignum_from_bin(bn, (unsigned long) len, bin) _libssh2_wincng_bignum_from_bin(bn, (ULONG) len, bin)
#define _libssh2_bn_to_bin(bn, bin) \ #define _libssh2_bn_to_bin(bn, bin) \
_libssh2_wincng_bignum_to_bin(bn, bin) _libssh2_wincng_bignum_to_bin(bn, bin)
#define _libssh2_bn_bytes(bn) bn->length #define _libssh2_bn_bytes(bn) bn->length
@@ -469,18 +459,18 @@ int _libssh2_wincng_random(void *buf, size_t len);
int int
_libssh2_wincng_hash_init(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hash_init(_libssh2_wincng_hash_ctx *ctx,
BCRYPT_ALG_HANDLE hAlg, unsigned long hashlen, BCRYPT_ALG_HANDLE hAlg, ULONG hashlen,
unsigned char *key, unsigned long keylen); unsigned char *key, ULONG keylen);
int int
_libssh2_wincng_hash_update(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hash_update(_libssh2_wincng_hash_ctx *ctx,
const unsigned char *data, unsigned long datalen); const unsigned char *data, ULONG datalen);
int int
_libssh2_wincng_hash_final(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hash_final(_libssh2_wincng_hash_ctx *ctx,
unsigned char *hash); unsigned char *hash);
int int
_libssh2_wincng_hash(const unsigned char *data, unsigned long datalen, _libssh2_wincng_hash(const unsigned char *data, ULONG datalen,
BCRYPT_ALG_HANDLE hAlg, BCRYPT_ALG_HANDLE hAlg,
unsigned char *hash, unsigned long hashlen); unsigned char *hash, ULONG hashlen);
int int
_libssh2_wincng_hmac_final(_libssh2_wincng_hash_ctx *ctx, _libssh2_wincng_hmac_final(_libssh2_wincng_hash_ctx *ctx,
@@ -607,11 +597,11 @@ _libssh2_wincng_cipher_dtor(_libssh2_cipher_ctx *ctx);
_libssh2_bn * _libssh2_bn *
_libssh2_wincng_bignum_init(void); _libssh2_wincng_bignum_init(void);
int int
_libssh2_wincng_bignum_set_word(_libssh2_bn *bn, unsigned long word); _libssh2_wincng_bignum_set_word(_libssh2_bn *bn, ULONG word);
unsigned long ULONG
_libssh2_wincng_bignum_bits(const _libssh2_bn *bn); _libssh2_wincng_bignum_bits(const _libssh2_bn *bn);
void void
_libssh2_wincng_bignum_from_bin(_libssh2_bn *bn, unsigned long len, _libssh2_wincng_bignum_from_bin(_libssh2_bn *bn, ULONG len,
const unsigned char *bin); const unsigned char *bin);
void void
_libssh2_wincng_bignum_to_bin(const _libssh2_bn *bn, unsigned char *bin); _libssh2_wincng_bignum_to_bin(const _libssh2_bn *bn, unsigned char *bin);