diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-26 08:47:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-26 11:35:31 +0200 |
| commit | fcbf2e682cedebdf768dc90273889b1f8d4b2ce4 (patch) | |
| tree | 28e429fafddc8b5cdb9e2e4141f2730fc3c1b3f9 /lib/ssh/src/Makefile | |
| parent | 0f3f8f5871a1ea503cc80ae17adc8dec96c79445 (diff) | |
| download | otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.tar.gz otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.tar.bz2 otp-fcbf2e682cedebdf768dc90273889b1f8d4b2ce4.zip | |
ssh: Use old crypto with newer ssh
Many issues with previous process design, causing for instance process leaks,
are compleatly gone in the redesigned ssh-3.0 and later.
This is a backport of newer ssh design to R15B
Diffstat (limited to 'lib/ssh/src/Makefile')
| -rw-r--r-- | lib/ssh/src/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile index b8eecd3fa2..2ef2859fd7 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2012. All Rights Reserved. +# Copyright Ericsson AB 2004-2013. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -41,7 +41,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN) BEHAVIOUR_MODULES= \ ssh_sftpd_file_api \ ssh_channel \ - ssh_key_api + ssh_daemon_channel \ + ssh_client_key_api \ + ssh_server_key_api MODULES= \ ssh \ @@ -51,7 +53,6 @@ MODULES= \ ssh_connection_sup \ ssh_connection \ ssh_connection_handler \ - ssh_connection_manager \ ssh_shell \ ssh_system_sup \ ssh_subsystem_sup \ @@ -65,12 +66,12 @@ MODULES= \ ssh_file \ ssh_io \ ssh_math \ + ssh_message \ ssh_no_io \ ssh_sftp \ ssh_sftpd \ ssh_sftpd_file\ ssh_transport \ - ssh_userreg \ ssh_xfer PUBLIC_HRL_FILES= ssh.hrl ssh_userauth.hrl ssh_xfer.hrl @@ -118,10 +119,10 @@ clean: rm -f errs core *~ $(APP_TARGET): $(APP_SRC) ../vsn.mk - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ docs: |