diff options
| author | Hans Nilsson <[email protected]> | 2015-11-06 10:24:48 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-11-06 10:24:48 +0100 |
| commit | a3bc0687a34623824bf980c9ed19eb204dcccf66 (patch) | |
| tree | 30cbb844aee7f3aef5cccdff73530a4198d3314a /lib/public_key/src/Makefile | |
| parent | 0ce885af02b6666d498c408ff0188a5fd22c8575 (diff) | |
| parent | 7adbd6ee24fa7f1bb3c26d5106e7e38446405f16 (diff) | |
| download | otp-a3bc0687a34623824bf980c9ed19eb204dcccf66.tar.gz otp-a3bc0687a34623824bf980c9ed19eb204dcccf66.tar.bz2 otp-a3bc0687a34623824bf980c9ed19eb204dcccf66.zip | |
Merge branch 'hans/ssh/random_modulus/OTP-13054' into maint
* hans/ssh/random_modulus/OTP-13054:
ssh: correct a bad doc xref
public_key: renamed priv/ssh_moduli -> priv/moduli
ssh, public_key: updates after doc review
ssh: changes after doc review
ssh: extend 'dh_gex_limits' to server side
ssh: option dh_gex_groups with tag ssh_moduli_file
ssh, public_key: random selection of diffie-hellman moduli
Diffstat (limited to 'lib/public_key/src/Makefile')
| -rw-r--r-- | lib/public_key/src/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile index 621cedadcd..786f244f85 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -50,7 +50,7 @@ MODULES = \ HRL_FILES = $(INCLUDE)/public_key.hrl -INTERNAL_HRL_FILES = +INTERNAL_HRL_FILES = pubkey_moduli.hrl ERL_FILES = $(MODULES:%=%.erl) @@ -86,6 +86,11 @@ ERL_COMPILE_FLAGS += $(PUB_KEY_ERL_FLAGS) \ debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(HRL_FILES) +$(EBIN)/pubkey_ssh.$(EMULATOR): pubkey_moduli.hrl + +pubkey_moduli.hrl: ../priv/moduli + escript ../priv/convert.escript $< $@ + clean: rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) rm -f core |