summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-12 15:32:35 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-12 15:32:35 +0100
commita9128eac414e56882a12571e4856873a19ff6ec3 (patch)
treee12bc338d77c78fff998953dd0d7f1cf27f22e18
parent4d152bf1d9ff894119e913e6506632348107cf65 (diff)
daemon: Use `openssl' from $PATH.
* daemon.am (-DOPENSSL_PATH): Default to "openssl". * TODO: Mention removal of OpenSSL dependency.
-rw-r--r--TODO9
-rw-r--r--daemon.am2
2 files changed, 10 insertions, 1 deletions
diff --git a/TODO b/TODO
index 1579504ea58..5510ee8c76c 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,15 @@ and GC-related tasks. The daemon mainly uses ‘libstore’ from Nix.
14Integrating it in Guix itself will make Guix self-contained, thereby 14Integrating it in Guix itself will make Guix self-contained, thereby
15simplifying our users’ lives. 15simplifying our users’ lives.
16 16
17** Remove dependency on OpenSSL
18
19The ‘openssl’ command-line tool is used in libstore to sign store paths
20to be exported, and to check such signatures. The signing keys are
21usually in /etc/nix/signing-key.{pub,sec}. They are a PKCS#8-encoded
22X.509 SubjectPublicKeyInfo. These can be decoded with the [[http://lists.gnu.org/archive/html/help-gnutls/2012-12/msg00012.html][C API of
23GnuTLS]], but not yet with its Guile bindings. There’s also
24‘gnutls_privkey_sign_data’ to sign, and related functions.
25
17* infrastructure 26* infrastructure
18 27
19** have a Hydra instance build Guix packages 28** have a Hydra instance build Guix packages
diff --git a/daemon.am b/daemon.am
index b2c0e649eb9..aa75c6ed298 100644
--- a/daemon.am
+++ b/daemon.am
@@ -114,7 +114,7 @@ libstore_a_CPPFLAGS = \
114 -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ 114 -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
115 -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ 115 -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
116 -DNIX_BIN_DIR=\"$(bindir)\" \ 116 -DNIX_BIN_DIR=\"$(bindir)\" \
117 -DOPENSSL_PATH="\"FIXME--no OpenSSL support\"" 117 -DOPENSSL_PATH="\"openssl\""
118 118
119libstore_a_CFLAGS = \ 119libstore_a_CFLAGS = \
120 $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) 120 $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)