aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ftp/src
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2018-03-07 09:19:25 +0100
committerPéter Dimitrov <[email protected]>2018-03-28 10:19:38 +0200
commit118dc092313b7eae9dd4084bb354cec644823ab2 (patch)
tree7ada2ebf5d0c7c0e1ac7151734558d487b600c4d /lib/ftp/src
parent4fc92e109803c69aa0ff0bba11b05ff9ce119f05 (diff)
downloadotp-118dc092313b7eae9dd4084bb354cec644823ab2.tar.gz
otp-118dc092313b7eae9dd4084bb354cec644823ab2.tar.bz2
otp-118dc092313b7eae9dd4084bb354cec644823ab2.zip
ftp: Refactor ftp tests
- Add appup file - Update vsftpd configuration file with stronger cipher suites - Remove unused functions from ftp_test_lib - Improve certificate generation Change-Id: I941e922d7532a3f2a05662aff621a175b630d3b5
Diffstat (limited to 'lib/ftp/src')
-rw-r--r--lib/ftp/src/Makefile6
-rw-r--r--lib/ftp/src/ftp.appup.src26
2 files changed, 29 insertions, 3 deletions
diff --git a/lib/ftp/src/Makefile b/lib/ftp/src/Makefile
index d5b197d18d..6a6df6bde4 100644
--- a/lib/ftp/src/Makefile
+++ b/lib/ftp/src/Makefile
@@ -60,12 +60,12 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
APP_FILE= ftp.app
-#APPUP_FILE= ftp.appup
+APPUP_FILE= ftp.appup
APP_SRC= $(APP_FILE).src
APP_TARGET= $(EBIN)/$(APP_FILE)
-#APPUP_SRC= $(APPUP_FILE).src
-#APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
# ----------------------------------------------------
# FLAGS
diff --git a/lib/ftp/src/ftp.appup.src b/lib/ftp/src/ftp.appup.src
new file mode 100644
index 0000000000..f5798ef976
--- /dev/null
+++ b/lib/ftp/src/ftp.appup.src
@@ -0,0 +1,26 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%% http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+{"%VSN%",
+ [
+ {<<"*">>,[{restart_application, ftp}]}
+ ],
+ [
+ {<<"*">>,[{restart_application, ftp}]}
+ ]
+}.