X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fssl_locl.h;h=750219fdc1392d0c89b2139ecce805a7ba2bb10a;hp=78fc001477df25cd97491683c7e66a11b372f0e2;hb=536199ece0469e6ee2d6d0c0d19c01adeae4c6fb;hpb=2ec6cb33856e56a3e7d15c019f17e08a8bb33093 diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 78fc001477..750219fdc1 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1571,9 +1571,8 @@ struct tls_sigalgs_st { int sign_nid; /* Combined hash and signature NID */ int signandhash_nid; - /* Raw values used in extension */ - unsigned char rsign; - unsigned char rhash; + /* Raw value used in extension */ + unsigned int rsigalg; }; # define FP_ICC (int (*)(const void *,const void *)) @@ -2144,10 +2143,10 @@ __owur int tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello, SSL_SESSION **ret); __owur int tls_use_ticket(SSL *s); -__owur int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk, +__owur int tls12_get_sigandhash(SSL *s, WPACKET *pkt, const EVP_PKEY *pk, const EVP_MD *md); __owur int tls12_get_sigid(const EVP_PKEY *pk); -__owur const EVP_MD *tls12_get_hash(unsigned char hash_alg); +__owur const EVP_MD *tls12_get_hash(int hash_nid); void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op); __owur int tls1_set_sigalgs_list(CERT *c, const char *str, int client);