From d7971f73cb05a2aabf4e3e2f9f1685c2e1ccf6f2 Mon Sep 17 00:00:00 2001
From: Paul Meinhardt <paul@bitcrowd.net>
Date: Fri, 21 Jun 2019 09:32:29 +0200
Subject: Remove unused "ssh_key" record definition

---
 lib/ssh/src/ssh.hrl | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 54e98ee10e..5d06722ea7 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -478,14 +478,6 @@
           recv_ext_info
 	 }).
 
--record(ssh_key,
-	{
-	  type,
-	  public,
-	  private,
-	  comment = ""
-	 }).
-
 -record(ssh_pty, {term = "", % e.g. "xterm"
 		  width = 80,
 		  height = 25,
-- 
cgit v1.2.3


From dc91de34cf93f65fc38cda8e49deef614e3ce7f9 Mon Sep 17 00:00:00 2001
From: Paul Meinhardt <paul@bitcrowd.net>
Date: Fri, 21 Jun 2019 09:34:03 +0200
Subject: Remove unused "ssh_assert" macro definition

---
 lib/ssh/src/ssh.hrl | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 5d06722ea7..52a2d4b297 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -485,13 +485,6 @@
 		  pixel_height = 768,
 		  modes = <<>>}).
 
-%% assertion macro
--define(ssh_assert(Expr, Reason),
-	case Expr of
-	    true -> ok;
-	    _ -> exit(Reason)
-	end).
-
 
 %% dbg help macros
 -define(wr_record(N,BlackList),
-- 
cgit v1.2.3


From a6c2a643d190774acd803fb2f105e5fc6846dbc2 Mon Sep 17 00:00:00 2001
From: Sebastien Merle <s.merle@gmail.com>
Date: Wed, 19 Jun 2019 16:34:53 +0200
Subject: crypto: Fix the build of static crypto nifs

---
 lib/crypto/c_src/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 2512013ed6..f922c3fb9b 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -100,8 +100,7 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/srp$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
-CRYPTO_STATIC_OBJS = $(OBJDIR)/crypto_static$(TYPEMARKER).o\
-	$(OBJDIR)/crypto_callback_static$(TYPEMARKER).o
+CRYPTO_STATIC_OBJS = $(patsubst $(OBJDIR)/%$(TYPEMARKER).o,$(OBJDIR)/%_static$(TYPEMARKER).o,$(CRYPTO_OBJS) $(CALLBACK_OBJS))
 
 NIF_ARCHIVE = $(LIBDIR)/crypto$(TYPEMARKER).a
 
-- 
cgit v1.2.3