diff options
| author | Rob Percival <robpercival@google.com> | 2016-03-02 13:34:05 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-04 10:50:10 -0500 |
| commit | dd696a55a2554cc8c89dd64f7e1171ce211dfc5c (patch) | |
| tree | fe2299f0f9f213f0e07179fe1548b2be1a745c87 /apps/Makefile.in | |
| parent | 98d8ddd25474b954d52f01086fcc2536965d015b (diff) | |
| download | openssl-dd696a55a2554cc8c89dd64f7e1171ce211dfc5c.zip openssl-dd696a55a2554cc8c89dd64f7e1171ce211dfc5c.tar.gz openssl-dd696a55a2554cc8c89dd64f7e1171ce211dfc5c.tar.bz2 | |
Extends s_client to allow a basic CT policy to be enabled
Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/Makefile.in')
| -rw-r--r-- | apps/Makefile.in | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/apps/Makefile.in b/apps/Makefile.in index 956d84b..f9eba16 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -30,6 +30,7 @@ LIBSSL=-L.. -lssl SCRIPTS=CA.pl tsget EXE= openssl$(EXE_EXT) +CONFS=openssl.cnf ct_log_list.cnf COMMANDS= \ asn1pars.o ca.o ciphers.o cms.o crl.o crl2p7.o dgst.o dhparam.o \ @@ -92,10 +93,14 @@ install: cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \ chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \ mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i ); \ - done - @cp openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new; \ - chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new; \ - mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf + done; + @set -e; for i in $(CONFS); \ + do \ + (echo installing $$i; \ + cp $$i $(DESTDIR)$(OPENSSLDIR)/$$i.new; \ + chmod 644 $(DESTDIR)$(OPENSSLDIR)/$$i.new; \ + mv -f $(DESTDIR)$(OPENSSLDIR)/$$i.new $(DESTDIR)$(OPENSSLDIR)/$$i ); \ + done; uninstall: @set -e; for i in $(EXE); \ @@ -107,8 +112,12 @@ uninstall: do \ echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \ $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \ - done - $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf + done; + @set -e; for i in $(CONFS); \ + do \ + echo $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \ + $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \ + done; generate: openssl-vms.cnf progs.h |