Skip to content

CFE-2613: Include and package cf-keycrypt with core #2883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
olehermanse wants to merge 4 commits into from
Closed

CFE-2613: Include and package cf-keycrypt with core #2883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3f66cb
Moved the cf-keycrypt utility to CFEngine core
jonhenrik13 Jul 5, 2017
4868fed
Added sys.cf-keycrypt component variable
olehermanse Jul 5, 2017
f03e817
Acceptance tests for cf-keycrypt
nickanderson Jul 6, 2017
509f825
Changed the syntax of cf-keycrypt to match other components
olehermanse Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ stamp-h1
/cf-runagent/cf-runagent.exe
/cf-net/cf-net
/cf-net/cf-net.exe
/cf-keycrypt/cf-keycrypt
/cf-keycrypt/cf-keycrypt.exe
/cf-serverd/cf-serverd
/cf-serverd/cf-serverd.exe
/cf-upgrade/cf-upgrade
Expand Down
1 change: 1 addition & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ SUBDIRS = libcompat \
cf-serverd \
cf-upgrade \
cf-net \
cf-keycrypt \
misc \
ext \
examples \
Expand Down
51 changes: 51 additions & 0 deletions cf-keycrypt/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#
# Copyright (C) CFEngine AS
#
# This file is part of CFEngine 3 - written and maintained by CFEngine AS.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# To the extent this program is licensed as part of the Enterprise
# versions of CFEngine, the applicable Commercial Open Source License
# (COSL) may apply to this file if you as a licensee so wish it. See
# included file COSL.txt.
#
noinst_LTLIBRARIES = libcf-keycrypt.la

AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libutils \
-I$(srcdir)/../libcfnet \
$(OPENSSL_CPPFLAGS) \
$(PCRE_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

libcf_keycrypt_la_LIBADD = ../libpromises/libpromises.la

libcf_keycrypt_la_SOURCES = cf-keycrypt.c

if !BUILTIN_EXTENSIONS
bin_PROGRAMS = cf-keycrypt
cf_keycrypt_LDADD = libcf-keycrypt.la
cf_keycrypt_SOURCES =
endif

CLEANFILES = *.gcno *.gcda

#
# Some basic clean ups
#
MOSTLYCLEANFILES = *~ *.orig *.rej
Loading