summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2015-10-02 14:30:10 +0000
committerjsing <>2015-10-02 14:30:10 +0000
commit5951a0298417b41fc2a1fb4ad8a057fb9530e872 (patch)
treebad81d0499935c7d767c8aafc50e1d43ce137c26 /src/lib
parentd7c5788e4d824d6e38da5ce78edcddac5aab2484 (diff)
downloadopenbsd-5951a0298417b41fc2a1fb4ad8a057fb9530e872.tar.gz
openbsd-5951a0298417b41fc2a1fb4ad8a057fb9530e872.tar.bz2
openbsd-5951a0298417b41fc2a1fb4ad8a057fb9530e872.zip
s/ssl3_client_kex/ssl3_send_client_kex/ for consistency with the caller.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/s3_clnt.c20
-rw-r--r--src/lib/libssl/src/ssl/s3_clnt.c20
2 files changed, 22 insertions, 18 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 52b9baadbf..afeb499e71 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_clnt.c,v 1.135 2015/09/13 12:52:07 jsing Exp $ */ 1/* $OpenBSD: s3_clnt.c,v 1.136 2015/10/02 14:30:10 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 *
@@ -1854,7 +1854,8 @@ ssl3_get_server_done(SSL *s)
1854} 1854}
1855 1855
1856static int 1856static int
1857ssl3_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, unsigned char *p, int *outlen) 1857ssl3_send_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1858 int *outlen)
1858{ 1859{
1859 unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH]; 1860 unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
1860 EVP_PKEY *pkey = NULL; 1861 EVP_PKEY *pkey = NULL;
@@ -1905,7 +1906,8 @@ err:
1905} 1906}
1906 1907
1907static int 1908static int
1908ssl3_client_kex_dhe(SSL *s, SESS_CERT *sess_cert, unsigned char *p, int *outlen) 1909ssl3_send_client_kex_dhe(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1910 int *outlen)
1909{ 1911{
1910 DH *dh_srvr = NULL, *dh_clnt = NULL; 1912 DH *dh_srvr = NULL, *dh_clnt = NULL;
1911 unsigned char *key = NULL; 1913 unsigned char *key = NULL;
@@ -1966,7 +1968,7 @@ err:
1966} 1968}
1967 1969
1968static int 1970static int
1969ssl3_client_kex_ecdh(SSL *s, SESS_CERT *sess_cert, unsigned char *p, 1971ssl3_send_client_kex_ecdh(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1970 int *outlen) 1972 int *outlen)
1971{ 1973{
1972 EC_KEY *tkey, *clnt_ecdh = NULL; 1974 EC_KEY *tkey, *clnt_ecdh = NULL;
@@ -2097,7 +2099,7 @@ err:
2097} 2099}
2098 2100
2099static int 2101static int
2100ssl3_client_kex_gost(SSL *s, SESS_CERT *sess_cert, unsigned char *p, 2102ssl3_send_client_kex_gost(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
2101 int *outlen) 2103 int *outlen)
2102{ 2104{
2103 unsigned char premaster_secret[32], shared_ukm[32], tmp[256]; 2105 unsigned char premaster_secret[32], shared_ukm[32], tmp[256];
@@ -2235,16 +2237,16 @@ ssl3_send_client_key_exchange(SSL *s)
2235 } 2237 }
2236 2238
2237 if (alg_k & SSL_kRSA) { 2239 if (alg_k & SSL_kRSA) {
2238 if (ssl3_client_kex_rsa(s, sess_cert, p, &n) != 1) 2240 if (ssl3_send_client_kex_rsa(s, sess_cert, p, &n) != 1)
2239 goto err; 2241 goto err;
2240 } else if (alg_k & SSL_kDHE) { 2242 } else if (alg_k & SSL_kDHE) {
2241 if (ssl3_client_kex_dhe(s, sess_cert, p, &n) != 1) 2243 if (ssl3_send_client_kex_dhe(s, sess_cert, p, &n) != 1)
2242 goto err; 2244 goto err;
2243 } else if (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) { 2245 } else if (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) {
2244 if (ssl3_client_kex_ecdh(s, sess_cert, p, &n) != 1) 2246 if (ssl3_send_client_kex_ecdh(s, sess_cert, p, &n) != 1)
2245 goto err; 2247 goto err;
2246 } else if (alg_k & SSL_kGOST) { 2248 } else if (alg_k & SSL_kGOST) {
2247 if (ssl3_client_kex_gost(s, sess_cert, p, &n) != 1) 2249 if (ssl3_send_client_kex_gost(s, sess_cert, p, &n) != 1)
2248 goto err; 2250 goto err;
2249 } else { 2251 } else {
2250 ssl3_send_alert(s, SSL3_AL_FATAL, 2252 ssl3_send_alert(s, SSL3_AL_FATAL,
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 52b9baadbf..afeb499e71 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_clnt.c,v 1.135 2015/09/13 12:52:07 jsing Exp $ */ 1/* $OpenBSD: s3_clnt.c,v 1.136 2015/10/02 14:30:10 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 *
@@ -1854,7 +1854,8 @@ ssl3_get_server_done(SSL *s)
1854} 1854}
1855 1855
1856static int 1856static int
1857ssl3_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, unsigned char *p, int *outlen) 1857ssl3_send_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1858 int *outlen)
1858{ 1859{
1859 unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH]; 1860 unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
1860 EVP_PKEY *pkey = NULL; 1861 EVP_PKEY *pkey = NULL;
@@ -1905,7 +1906,8 @@ err:
1905} 1906}
1906 1907
1907static int 1908static int
1908ssl3_client_kex_dhe(SSL *s, SESS_CERT *sess_cert, unsigned char *p, int *outlen) 1909ssl3_send_client_kex_dhe(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1910 int *outlen)
1909{ 1911{
1910 DH *dh_srvr = NULL, *dh_clnt = NULL; 1912 DH *dh_srvr = NULL, *dh_clnt = NULL;
1911 unsigned char *key = NULL; 1913 unsigned char *key = NULL;
@@ -1966,7 +1968,7 @@ err:
1966} 1968}
1967 1969
1968static int 1970static int
1969ssl3_client_kex_ecdh(SSL *s, SESS_CERT *sess_cert, unsigned char *p, 1971ssl3_send_client_kex_ecdh(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1970 int *outlen) 1972 int *outlen)
1971{ 1973{
1972 EC_KEY *tkey, *clnt_ecdh = NULL; 1974 EC_KEY *tkey, *clnt_ecdh = NULL;
@@ -2097,7 +2099,7 @@ err:
2097} 2099}
2098 2100
2099static int 2101static int
2100ssl3_client_kex_gost(SSL *s, SESS_CERT *sess_cert, unsigned char *p, 2102ssl3_send_client_kex_gost(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
2101 int *outlen) 2103 int *outlen)
2102{ 2104{
2103 unsigned char premaster_secret[32], shared_ukm[32], tmp[256]; 2105 unsigned char premaster_secret[32], shared_ukm[32], tmp[256];
@@ -2235,16 +2237,16 @@ ssl3_send_client_key_exchange(SSL *s)
2235 } 2237 }
2236 2238
2237 if (alg_k & SSL_kRSA) { 2239 if (alg_k & SSL_kRSA) {
2238 if (ssl3_client_kex_rsa(s, sess_cert, p, &n) != 1) 2240 if (ssl3_send_client_kex_rsa(s, sess_cert, p, &n) != 1)
2239 goto err; 2241 goto err;
2240 } else if (alg_k & SSL_kDHE) { 2242 } else if (alg_k & SSL_kDHE) {
2241 if (ssl3_client_kex_dhe(s, sess_cert, p, &n) != 1) 2243 if (ssl3_send_client_kex_dhe(s, sess_cert, p, &n) != 1)
2242 goto err; 2244 goto err;
2243 } else if (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) { 2245 } else if (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) {
2244 if (ssl3_client_kex_ecdh(s, sess_cert, p, &n) != 1) 2246 if (ssl3_send_client_kex_ecdh(s, sess_cert, p, &n) != 1)
2245 goto err; 2247 goto err;
2246 } else if (alg_k & SSL_kGOST) { 2248 } else if (alg_k & SSL_kGOST) {
2247 if (ssl3_client_kex_gost(s, sess_cert, p, &n) != 1) 2249 if (ssl3_send_client_kex_gost(s, sess_cert, p, &n) != 1)
2248 goto err; 2250 goto err;
2249 } else { 2251 } else {
2250 ssl3_send_alert(s, SSL3_AL_FATAL, 2252 ssl3_send_alert(s, SSL3_AL_FATAL,
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 12:18:32 +0000