From 092f44aa56f8d509a14a8c833848ff7292966c2e Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 11 Sep 2015 17:04:39 +0000
Subject: Nuke ssl3_final_finish_mac().

ok "flensing knife"
---
 src/lib/libssl/src/ssl/s3_enc.c   | 17 +----------------
 src/lib/libssl/src/ssl/ssl_locl.h |  4 +---
 src/lib/libssl/ssl_locl.h         |  4 +---
 3 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c
index 14c29e4edd..2b0b923d30 100644
--- a/src/lib/libssl/src/ssl/s3_enc.c
+++ b/src/lib/libssl/src/ssl/s3_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_enc.c,v 1.67 2015/09/11 17:03:03 jsing Exp $ */
+/* $OpenBSD: s3_enc.c,v 1.68 2015/09/11 17:04:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -280,21 +280,6 @@ ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p)
 	return (ssl3_handshake_mac(s, md_nid, NULL, 0, p));
 }
 
-int
-ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
-{
-	int ret_md5, ret_sha1;
-
-	ret_md5 = ssl3_handshake_mac(s, NID_md5, sender, len, p);
-	if (ret_md5 == 0)
-		return 0;
-	p += ret_md5;
-	ret_sha1 = ssl3_handshake_mac(s, NID_sha1, sender, len, p);
-	if (ret_sha1 == 0)
-		return 0;
-	return (ret_md5 + ret_sha1);
-}
-
 static int
 ssl3_handshake_mac(SSL *s, int md_nid, const char *sender, int len,
     unsigned char *p)
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index e4c6c45196..d4924cdab8 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.110 2015/09/11 17:03:03 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.111 2015/09/11 17:04:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -621,8 +621,6 @@ int ssl3_renegotiate_check(SSL *ssl);
 int ssl3_dispatch_alert(SSL *s);
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
 int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
-int ssl3_final_finish_mac(SSL *s, const char *sender, int slen,
-    unsigned char *p);
 int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
 void ssl3_free_digest_list(SSL *s);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index e4c6c45196..d4924cdab8 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.110 2015/09/11 17:03:03 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.111 2015/09/11 17:04:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -621,8 +621,6 @@ int ssl3_renegotiate_check(SSL *ssl);
 int ssl3_dispatch_alert(SSL *s);
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
 int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
-int ssl3_final_finish_mac(SSL *s, const char *sender, int slen,
-    unsigned char *p);
 int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
 void ssl3_free_digest_list(SSL *s);
-- 
cgit v1.2.3-55-g6feb