From cea0cc4df6ac1a0c5c062dfc325b7e704b3f556d Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Tue, 12 Jun 2012 10:41:06 +0000 Subject: [PATCH] -fixes --- src/gns/{createProxyCa.sh => gnunet-gns-proxy-setup-ca} | 5 +---- src/gns/gnunet-gns-proxy.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename src/gns/{createProxyCa.sh => gnunet-gns-proxy-setup-ca} (88%) diff --git a/src/gns/createProxyCa.sh b/src/gns/gnunet-gns-proxy-setup-ca similarity index 88% rename from src/gns/createProxyCa.sh rename to src/gns/gnunet-gns-proxy-setup-ca index 43855241e..019db0763 100644 --- a/src/gns/createProxyCa.sh +++ b/src/gns/gnunet-gns-proxy-setup-ca @@ -6,12 +6,9 @@ echo "Removing passphrase from key" openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out gnscakeynoenc.pem cp gnscacert.pem $HOME/.gnunet/gns/gnscert.pem -cat gnscacert.pem >> $HOME/.gnunet/gns/gnsCAcert.pem +cat gnscacert.pem > $HOME/.gnunet/gns/gnsCAcert.pem cat gnscakeynoenc.pem >> $HOME/.gnunet/gns/gnsCAcert.pem -cat gnscakey.pem -cat gnscacert.pem -echo "Cleaning up" rm gnscakey.pem gnscakeynoenc.pem gnscacert.pem echo "Next steps:" diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 790a9f474..d6e5ba3d1 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -2380,8 +2380,7 @@ run (void *cls, char *const *args, const char *cfgfile, load_cert_from_file (proxy_ca.cert, cafile); load_key_from_file (proxy_ca.key, cafile); - if (cafile_cfg) - GNUNET_free (cafile_cfg); + GNUNET_free_non_null (cafile_cfg); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loading Template\n"); -- 2.25.1