kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup unused leftovers from commit 3191c341b9

Browse Source
This commit is contained in:
Henrik Andersson 2019-01-24 12:34:23 +01:00
parent 78a9dcff68
commit bc3a5789e4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssl.c
View File

@ -180,7 +180,6 @@ RDSSL_RKEY *
rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len) rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
{ {
int ret; int ret;
int check_pk_algo;
RDSSL_RKEY *pkey; RDSSL_RKEY *pkey;
gnutls_datum_t m, e; gnutls_datum_t m, e;
@ -192,8 +191,6 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
uint8_t data[2048]; uint8_t data[2048];
size_t len; size_t len;
check_pk_algo = 1;
algo = gnutls_x509_crt_get_pk_algorithm(*cert, &bits); algo = gnutls_x509_crt_get_pk_algorithm(*cert, &bits);
/* By some reason, Microsoft sets the OID of the Public RSA key to /* By some reason, Microsoft sets the OID of the Public RSA key to
@ -228,10 +225,9 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
return NULL; return NULL;
} }
if (!strncmp(oid, OID_SHA_WITH_RSA_SIGNATURE, strlen(OID_SHA_WITH_RSA_SIGNATURE)) if (!(strncmp(oid, OID_SHA_WITH_RSA_SIGNATURE, strlen(OID_SHA_WITH_RSA_SIGNATURE)) == 0
|| !strncmp(oid, OID_MD5_WITH_RSA_SIGNATURE, strlen(OID_MD5_WITH_RSA_SIGNATURE))) { || strncmp(oid, OID_MD5_WITH_RSA_SIGNATURE, strlen(OID_MD5_WITH_RSA_SIGNATURE)) == 0))
check_pk_algo = 0; {
} else {
logger(Protocol, Error, "%s:%s:%d: Wrong public key algorithm algo = 0x%02x (%s)\n", logger(Protocol, Error, "%s:%s:%d: Wrong public key algorithm algo = 0x%02x (%s)\n",
__FILE__, __func__, __LINE__, algo, oid); __FILE__, __func__, __LINE__, algo, oid);
return NULL; return NULL;