summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2022-01-09 15:34:21 +0000
committerjsing <>2022-01-09 15:34:21 +0000
commite1863037aca969edcb67eeefc150cee6966f2040 (patch)
tree2fc261c8befa388e0f4f5acc30e2233502aa04fc
parentdb6d5503661a90e98e23aacef2cfe54efc99f1e0 (diff)
downloadopenbsd-e1863037aca969edcb67eeefc150cee6966f2040.tar.gz
openbsd-e1863037aca969edcb67eeefc150cee6966f2040.tar.bz2
openbsd-e1863037aca969edcb67eeefc150cee6966f2040.zip
Return 0/1 from ssl3_{send,get}_client_kex_gost()
Like other KEX handling functions, there is no need to return anything other than failure/success here. ok inoguchi@ tb@
-rw-r--r--src/lib/libssl/ssl_clnt.c8
-rw-r--r--src/lib/libssl/ssl_srvr.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index d0910c8f73..cc66ed0473 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.130 2022/01/09 15:29:42 jsing Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.131 2022/01/09 15:34:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1931,9 +1931,9 @@ ssl3_send_client_kex_gost(SSL *s, CBB *cbb)
1931 size_t msglen; 1931 size_t msglen;
1932 unsigned int md_len; 1932 unsigned int md_len;
1933 EVP_MD_CTX *ukm_hash; 1933 EVP_MD_CTX *ukm_hash;
1934 int ret = -1;
1935 int nid; 1934 int nid;
1936 CBB gostblob; 1935 CBB gostblob;
1936 int ret = 0;
1937 1937
1938 /* Get server sertificate PKEY and create ctx from it */ 1938 /* Get server sertificate PKEY and create ctx from it */
1939 peer_cert = s->session->peer_pkeys[SSL_PKEY_GOST01].x509; 1939 peer_cert = s->session->peer_pkeys[SSL_PKEY_GOST01].x509;
@@ -2027,7 +2027,7 @@ ssl3_send_client_kex_gost(SSL *s, CBB *cbb)
2027 explicit_bzero(premaster_secret, sizeof(premaster_secret)); 2027 explicit_bzero(premaster_secret, sizeof(premaster_secret));
2028 EVP_PKEY_free(pub_key); 2028 EVP_PKEY_free(pub_key);
2029 2029
2030 return (ret); 2030 return ret;
2031} 2031}
2032 2032
2033int 2033int
@@ -2055,7 +2055,7 @@ ssl3_send_client_key_exchange(SSL *s)
2055 if (!ssl3_send_client_kex_ecdhe(s, &kex)) 2055 if (!ssl3_send_client_kex_ecdhe(s, &kex))
2056 goto err; 2056 goto err;
2057 } else if (alg_k & SSL_kGOST) { 2057 } else if (alg_k & SSL_kGOST) {
2058 if (ssl3_send_client_kex_gost(s, &kex) != 1) 2058 if (!ssl3_send_client_kex_gost(s, &kex))
2059 goto err; 2059 goto err;
2060 } else { 2060 } else {
2061 ssl3_send_alert(s, SSL3_AL_FATAL, 2061 ssl3_send_alert(s, SSL3_AL_FATAL,
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index aa1b62c8db..1f6753fdf4 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.135 2022/01/09 15:28:47 jsing Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.136 2022/01/09 15:34:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1830,7 +1830,7 @@ ssl3_get_client_kex_gost(SSL *s, CBS *cbs)
1830 SSLerror(s, SSL_R_BAD_PACKET_LENGTH); 1830 SSLerror(s, SSL_R_BAD_PACKET_LENGTH);
1831 ssl3_send_alert(s, SSL3_AL_FATAL, al); 1831 ssl3_send_alert(s, SSL3_AL_FATAL, al);
1832 err: 1832 err:
1833 return (-1); 1833 return 0;
1834} 1834}
1835 1835
1836int 1836int
@@ -1862,7 +1862,7 @@ ssl3_get_client_key_exchange(SSL *s)
1862 if (!ssl3_get_client_kex_ecdhe(s, &cbs)) 1862 if (!ssl3_get_client_kex_ecdhe(s, &cbs))
1863 goto err; 1863 goto err;
1864 } else if (alg_k & SSL_kGOST) { 1864 } else if (alg_k & SSL_kGOST) {
1865 if (ssl3_get_client_kex_gost(s, &cbs) != 1) 1865 if (!ssl3_get_client_kex_gost(s, &cbs))
1866 goto err; 1866 goto err;
1867 } else { 1867 } else {
1868 al = SSL_AD_HANDSHAKE_FAILURE; 1868 al = SSL_AD_HANDSHAKE_FAILURE;