summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-05-28 13:00:55 +0000
committerjsing <>2014-05-28 13:00:55 +0000
commit60cd1d60f58b32225afb881559d08dbc68a2eb79 (patch)
tree304d0e83df82b82c3be2626a0541416e1f1e1ed5 /src
parent44b1ab0f6ed24380287a97a4709c7e4b7fd13d20 (diff)
downloadopenbsd-60cd1d60f58b32225afb881559d08dbc68a2eb79.tar.gz
openbsd-60cd1d60f58b32225afb881559d08dbc68a2eb79.tar.bz2
openbsd-60cd1d60f58b32225afb881559d08dbc68a2eb79.zip
More KNF.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/d1_srvr.c5
-rw-r--r--src/lib/libssl/src/ssl/d1_srvr.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 2c22a25bce..c8bfc1b03d 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1313,8 +1313,7 @@ dtls1_send_server_key_exchange(SSL *s)
1313 *p = encodedlen; 1313 *p = encodedlen;
1314 p += 1; 1314 p += 1;
1315 memcpy((unsigned char*)p, 1315 memcpy((unsigned char*)p,
1316 (unsigned char *)encodedPoint, 1316 (unsigned char *)encodedPoint, encodedlen);
1317 encodedlen);
1318 free(encodedPoint); 1317 free(encodedPoint);
1319 encodedPoint = NULL; 1318 encodedPoint = NULL;
1320 p += encodedlen; 1319 p += encodedlen;
@@ -1601,7 +1600,7 @@ dtls1_send_newsession_ticket(SSL *s)
1601 */ 1600 */
1602 if (tctx->tlsext_ticket_key_cb) { 1601 if (tctx->tlsext_ticket_key_cb) {
1603 if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, 1602 if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx,
1604 &hctx, 1) < 0) { 1603 &hctx, 1) < 0) {
1605 free(senc); 1604 free(senc);
1606 return -1; 1605 return -1;
1607 } 1606 }
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index 2c22a25bce..c8bfc1b03d 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -1313,8 +1313,7 @@ dtls1_send_server_key_exchange(SSL *s)
1313 *p = encodedlen; 1313 *p = encodedlen;
1314 p += 1; 1314 p += 1;
1315 memcpy((unsigned char*)p, 1315 memcpy((unsigned char*)p,
1316 (unsigned char *)encodedPoint, 1316 (unsigned char *)encodedPoint, encodedlen);
1317 encodedlen);
1318 free(encodedPoint); 1317 free(encodedPoint);
1319 encodedPoint = NULL; 1318 encodedPoint = NULL;
1320 p += encodedlen; 1319 p += encodedlen;
@@ -1601,7 +1600,7 @@ dtls1_send_newsession_ticket(SSL *s)
1601 */ 1600 */
1602 if (tctx->tlsext_ticket_key_cb) { 1601 if (tctx->tlsext_ticket_key_cb) {
1603 if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, 1602 if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx,
1604 &hctx, 1) < 0) { 1603 &hctx, 1) < 0) {
1605 free(senc); 1604 free(senc);
1606 return -1; 1605 return -1;
1607 } 1606 }