From 0b40e7802798dfde3ac6cc5f24dd1f20e03b8fb5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 9 Jan 2015 17:10:38 +0100 Subject: [PATCH] stop exporting microhttpd_lib API --- src/include/Makefile.am | 1 - src/include/taler_rsa.h | 3 +++ src/mint/Makefile.am | 1 + src/mint/taler-mint-httpd.c | 2 +- src/mint/taler-mint-httpd_deposit.c | 2 +- src/{util/microhttpd.c => mint/taler-mint-httpd_json.c} | 2 +- .../taler_microhttpd_lib.h => mint/taler-mint-httpd_json.h} | 0 src/mint/taler-mint-httpd_keys.c | 2 +- src/mint/taler-mint-httpd_mhd.c | 2 +- src/mint/taler-mint-httpd_refresh.c | 2 +- src/mint/taler-mint-httpd_withdraw.c | 2 +- src/util/Makefile.am | 1 - src/util/rsa.c | 3 +++ src/util/test_rsa.c | 4 ++++ 14 files changed, 18 insertions(+), 9 deletions(-) rename src/{util/microhttpd.c => mint/taler-mint-httpd_json.c} (99%) rename src/{include/taler_microhttpd_lib.h => mint/taler-mint-httpd_json.h} (100%) diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 42e6dda91..c95940ea2 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -4,7 +4,6 @@ talerinclude_HEADERS = \ platform.h \ taler_db_lib.h \ taler_json_lib.h \ - taler_microhttpd_lib.h \ taler_mint_service.h \ taler_rsa.h \ taler_signatures.h \ diff --git a/src/include/taler_rsa.h b/src/include/taler_rsa.h index 1ed530013..1d263ae09 100644 --- a/src/include/taler_rsa.h +++ b/src/include/taler_rsa.h @@ -1,3 +1,6 @@ +/* NOTE: this is obsolete logic, we should migrate to the + GNUNET_CRYPTO_rsa-API as soon as possible */ + /* This file is part of TALER (C) 2014 Christian Grothoff (and other contributing authors) diff --git a/src/mint/Makefile.am b/src/mint/Makefile.am index 2ae153485..d0a58812e 100644 --- a/src/mint/Makefile.am +++ b/src/mint/Makefile.am @@ -75,6 +75,7 @@ taler_mint_reservemod_LDFLAGS = \ taler_mint_httpd_SOURCES = \ taler-mint-httpd.c \ taler-mint-httpd_mhd.c \ + taler-mint-httpd_json.c taler-mint-httpd_json.h \ taler-mint-httpd_keys.c \ taler-mint-httpd_deposit.c \ taler-mint-httpd_withdraw.c \ diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c index 6d69813c0..1734e61ef 100644 --- a/src/mint/taler-mint-httpd.c +++ b/src/mint/taler-mint-httpd.c @@ -33,7 +33,7 @@ #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd_mhd.h" #include "taler-mint-httpd_keys.h" #include "taler-mint-httpd_deposit.h" diff --git a/src/mint/taler-mint-httpd_deposit.c b/src/mint/taler-mint-httpd_deposit.c index ecbc5c13b..2f6c3bc8f 100644 --- a/src/mint/taler-mint-httpd_deposit.c +++ b/src/mint/taler-mint-httpd_deposit.c @@ -32,7 +32,7 @@ #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd_keys.h" #include "taler-mint-httpd_deposit.h" diff --git a/src/util/microhttpd.c b/src/mint/taler-mint-httpd_json.c similarity index 99% rename from src/util/microhttpd.c rename to src/mint/taler-mint-httpd_json.c index f3bea74f8..e9183073f 100644 --- a/src/util/microhttpd.c +++ b/src/mint/taler-mint-httpd_json.c @@ -1,6 +1,6 @@ #include "platform.h" #include -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" diff --git a/src/include/taler_microhttpd_lib.h b/src/mint/taler-mint-httpd_json.h similarity index 100% rename from src/include/taler_microhttpd_lib.h rename to src/mint/taler-mint-httpd_json.h diff --git a/src/mint/taler-mint-httpd_keys.c b/src/mint/taler-mint-httpd_keys.c index ba023fe69..ce8bdf6e0 100644 --- a/src/mint/taler-mint-httpd_keys.c +++ b/src/mint/taler-mint-httpd_keys.c @@ -32,7 +32,7 @@ #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd_keys.h" diff --git a/src/mint/taler-mint-httpd_mhd.c b/src/mint/taler-mint-httpd_mhd.c index 09f3025b8..d78f36d95 100644 --- a/src/mint/taler-mint-httpd_mhd.c +++ b/src/mint/taler-mint-httpd_mhd.c @@ -27,7 +27,7 @@ #include #include #include -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd.h" #include "taler-mint-httpd_mhd.h" diff --git a/src/mint/taler-mint-httpd_refresh.c b/src/mint/taler-mint-httpd_refresh.c index 8121bb234..913f40fa2 100644 --- a/src/mint/taler-mint-httpd_refresh.c +++ b/src/mint/taler-mint-httpd_refresh.c @@ -32,7 +32,7 @@ #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd_keys.h" #include "taler-mint-httpd_mhd.h" #include "taler-mint-httpd_refresh.h" diff --git a/src/mint/taler-mint-httpd_withdraw.c b/src/mint/taler-mint-httpd_withdraw.c index 7ffa45706..0fd418540 100644 --- a/src/mint/taler-mint-httpd_withdraw.c +++ b/src/mint/taler-mint-httpd_withdraw.c @@ -32,7 +32,7 @@ #include "taler_signatures.h" #include "taler_rsa.h" #include "taler_json_lib.h" -#include "taler_microhttpd_lib.h" +#include "taler-mint-httpd_json.h" #include "taler-mint-httpd_keys.h" #include "taler-mint-httpd_mhd.h" #include "taler-mint-httpd_withdraw.h" diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f935802a6..b74e90da9 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -7,7 +7,6 @@ libtalerutil_la_SOURCES = \ util.c \ json.c \ db.c \ - microhttpd.c \ rsa.c libtalerutil_la_LIBADD = \ diff --git a/src/util/rsa.c b/src/util/rsa.c index cde56be9e..c34ab1661 100644 --- a/src/util/rsa.c +++ b/src/util/rsa.c @@ -1,3 +1,6 @@ +/* NOTE: this is obsolete logic, we should migrate to the + GNUNET_CRYPTO_rsa-API as soon as possible */ + /* This file is part of TALER (C) 2014 Christian Grothoff (and other contributing authors) diff --git a/src/util/test_rsa.c b/src/util/test_rsa.c index ac3ae2cd4..85114843d 100644 --- a/src/util/test_rsa.c +++ b/src/util/test_rsa.c @@ -1,3 +1,7 @@ +/* NOTE: this is obsolete logic, we should migrate to the + GNUNET_CRYPTO_rsa-API as soon as possible */ + + /* This file is part of TALER (C) 2014 Christian Grothoff (and other contributing authors)