rename ipcrypt/ipcipher

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 2f3feae43e8e021e2188d36409adebe3e58b9a58..23a71deebd2f2b8b94e029ed0f770b01ec915857 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -312,7 +312,7 @@ pdnsutil_SOURCES = \
        ednsoptions.cc ednsoptions.hh \
        ednssubnet.cc \
        gss_context.cc gss_context.hh \
-       ipcrypt.cc ipcrypt.hh ../ext/ipcrypt/ipcrypt.c ../ext/ipcrypt/ipcrypt.h \
+       ipcipher.cc ipcipher.hh ../ext/ipcrypt/ipcrypt.c ../ext/ipcrypt/ipcrypt.h \
        iputils.cc iputils.hh \
        json.cc \
        logger.cc \
@@ -1273,7 +1273,7 @@ testrunner_SOURCES = \
        ednssubnet.cc \
        gettime.cc gettime.hh \
        gss_context.cc gss_context.hh \
-       ipcrypt.cc ipcrypt.hh ../ext/ipcrypt/ipcrypt.c ../ext/ipcrypt/ipcrypt.h \
+       ipcipher.cc ipcipher.hh ../ext/ipcrypt/ipcrypt.c ../ext/ipcrypt/ipcrypt.h \
        iputils.cc \
        ixfr.cc ixfr.hh \
        logger.cc \

diff --git a/pdns/dnsdist-lua-bindings.cc b/pdns/dnsdist-lua-bindings.cc
index 5095a71a361b495665581e910d12603854a4cc8b..5cf15d153f00792213bd44f16a2ebf62148707fa 100644 (file)
--- a/pdns/dnsdist-lua-bindings.cc
+++ b/pdns/dnsdist-lua-bindings.cc
@@ -31,7 +31,7 @@
 #include "dolog.hh"
 #include "fstrm_logger.hh"
 #include "remote_logger.hh"
-#include "ipcrypt.hh"
+#include "ipcipher.hh"
 
 void setupLuaBindings(bool client)
 {

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index b38656ea2c38bc8cce15d192601bec27ba24b761..030e0b22a4f00d086819ef6c2e4fff7cfcdecb68 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -177,7 +177,7 @@ endif
 
 if HAVE_LIBSSL
 dnsdist_LDADD += $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
-dnsdist_SOURCES += ipcrypt.cc ipcrypt.hh ext/ipcrypt/ipcrypt.c ext/ipcrypt/ipcrypt.h 
+dnsdist_SOURCES += ipcipher.cc ipcipher.hh ext/ipcrypt/ipcrypt.c ext/ipcrypt/ipcrypt.h 
 endif
 
 if !HAVE_LUA_HPP

diff --git a/pdns/dnsdistdist/ipcipher.cc b/pdns/dnsdistdist/ipcipher.cc
new file mode 120000 (symlink)
index 0000000..794b273
--- /dev/null
+++ b/pdns/dnsdistdist/ipcipher.cc
@@ -0,0 +1 @@
+../ipcipher.cc
\ No newline at end of file

diff --git a/pdns/dnsdistdist/ipcipher.hh b/pdns/dnsdistdist/ipcipher.hh
new file mode 120000 (symlink)
index 0000000..e8d5917
--- /dev/null
+++ b/pdns/dnsdistdist/ipcipher.hh
@@ -0,0 +1 @@
+../ipcipher.hh
\ No newline at end of file

diff --git a/pdns/dnsdistdist/ipcrypt.cc b/pdns/dnsdistdist/ipcrypt.cc
deleted file mode 120000 (symlink)
index a0507b0..0000000
--- a/pdns/dnsdistdist/ipcrypt.cc
+++ /dev/null
@@ -1 +0,0 @@
-../ipcrypt.cc
\ No newline at end of file

diff --git a/pdns/dnsdistdist/ipcrypt.hh b/pdns/dnsdistdist/ipcrypt.hh
deleted file mode 120000 (symlink)
index 19ffbb7..0000000
--- a/pdns/dnsdistdist/ipcrypt.hh
+++ /dev/null
@@ -1 +0,0 @@
-../ipcrypt.hh
\ No newline at end of file

diff --git a/pdns/ipcrypt.cc b/pdns/ipcipher.cc
similarity index 97%
rename from pdns/ipcrypt.cc
rename to pdns/ipcipher.cc
index 173ec4d69bdfe9059ec1540acccc61f3e2c658c9..963f11509aa869dfaa26368671662551374f05f4 100644 (file)
--- a/pdns/ipcrypt.cc
+++ b/pdns/ipcipher.cc
@@ -1,4 +1,4 @@
-#include "ipcrypt.hh"
+#include "ipcipher.hh"
 #include "ext/ipcrypt/ipcrypt.h"
 #include <openssl/aes.h>
 #include <openssl/evp.h>
@@ -8,7 +8,7 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
                            const unsigned char *salt, int saltlen, int iter,
                            int keylen, unsigned char *out);
 */
-std::string makeIPCryptKey(const std::string& password)
+std::string makeIPCipherKey(const std::string& password)
 {
   static const char* salt="ipcryptipcrypt";
   unsigned char out[16];

diff --git a/pdns/ipcrypt.hh b/pdns/ipcipher.hh
similarity index 67%
rename from pdns/ipcrypt.hh
rename to pdns/ipcipher.hh
index cbb8dc5387b67ef3d8ae47e04e3e722dd5cdb635..cbb932d8f3720593f2abb3a3e87ffc7e64eff557 100644 (file)
--- a/pdns/ipcrypt.hh
+++ b/pdns/ipcipher.hh
@@ -2,6 +2,8 @@
 #include "iputils.hh"
 #include <string>
 
+// see https://powerdns.org/ipcipher
+
 ComboAddress encryptCA(const ComboAddress& ca, const std::string& key);
 ComboAddress decryptCA(const ComboAddress& ca, const std::string& key);
-std::string makeIPCryptKey(const std::string& password);
+std::string makeIPCipherKey(const std::string& password);

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 8bd356204aa96bdf364e5a5a83e5ffde2b2070a4..b73bbf39b102b74ee259577296f583a486b4a5e1 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -20,7 +20,7 @@
 #include "zoneparser-tng.hh"
 #include "signingpipe.hh"
 #include "dns_random.hh"
-#include "ipcrypt.hh"
+#include "ipcipher.hh"
 #include <fstream>
 #include <termios.h>            //termios, TCSANOW, ECHO, ICANON
 #include "opensslsigners.hh"
@@ -1005,7 +1005,7 @@ int editZone(DNSSECKeeper& dk, const DNSName &zone) {
 
 static int xcryptIP(const std::string& cmd, const std::string& ip, const std::string& key)
 {
-  string rkey = makeIPCryptKey(key);
+  string rkey = makeIPCipherKey(key);
   ComboAddress ca(ip), ret;
   
   if(cmd=="ipencrypt")