Skip to content

Commit

Permalink
fix make, drop unsupported websocks tools
Browse files Browse the repository at this point in the history 
Signed-off-by: R4SAS <[email protected]>
  • Loading branch information
@r4sas
r4sas committed Nov 17, 2020
1 parent b2ecc3a commit 07c5391
Show file tree
Hide file tree
Showing 20 changed files with 72 additions and 14,423 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vain
b33address
offlinekeys
regaddr_3ld
*.exe

# private key files
*.dat
Expand Down
45 changes: 24 additions & 21 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,55 +44,56 @@ OBJECTS = $(SOURCES:.cpp=.o)
I2PD_LIB = libi2pd.a


all: keygen keyinfo famtool routerinfo regaddr regaddr_3ld vain i2pbase64 offlinekeys b33address regaddralias
all: $(I2PD_LIB) keygen keyinfo famtool routerinfo regaddr regaddr_3ld vain i2pbase64 offlinekeys b33address regaddralias

routerinfo: $(OBJECTS)
$(CXX) -o routerinfo routerinfo.o $(LDFLAGS) $(LIBS)
routerinfo: routerinfo.o $(I2PD_LIB)
$(CXX) -o routerinfo routerinfo.o $(LDFLAGS) $(LIBS)

keygen: $(OBJECTS)
$(CXX) -o keygen keygen.o $(LDFLAGS) $(LIBS)
keygen: keygen.o $(I2PD_LIB)
$(CXX) -o keygen keygen.o $(LDFLAGS) $(LIBS)

keyinfo: $(OBJECTS)
$(CXX) -o keyinfo keyinfo.o $(LDFLAGS) $(LIBS)
keyinfo: keyinfo.o $(I2PD_LIB)
$(CXX) -o keyinfo keyinfo.o $(LDFLAGS) $(LIBS)

famtool: $(OBJECTS)
$(CXX) -o famtool famtool.o $(LDFLAGS) $(LIBS)
famtool: famtool.o $(I2PD_LIB)
$(CXX) -o famtool famtool.o $(LDFLAGS) $(LIBS)

regaddr: $(OBJECTS)
$(CXX) -o regaddr regaddr.o $(LDFLAGS) $(LIBS)
regaddr: regaddr.o $(I2PD_LIB)
$(CXX) -o regaddr regaddr.o $(LDFLAGS) $(LIBS)

regaddr_3ld: $(OBJECTS)
$(CXX) -o regaddr_3ld regaddr_3ld.o $(LDFLAGS) $(LIBS)
regaddr_3ld: regaddr_3ld.o $(I2PD_LIB)
$(CXX) -o regaddr_3ld regaddr_3ld.o $(LDFLAGS) $(LIBS)

vain: $(OBJECTS)
vain: vanitygen.o $(I2PD_LIB)
$(CXX) -o vain vanitygen.o $(LDFLAGS) $(LIBS)

i2pbase64: $(OBJECTS)
i2pbase64: i2pbase64.o $(I2PD_LIB)
$(CXX) -o i2pbase64 i2pbase64.o $(LDFLAGS) $(LIBS)

offlinekeys: $(OBJECTS)
offlinekeys: offlinekeys.o $(I2PD_LIB)
$(CXX) -o offlinekeys offlinekeys.o $(LDFLAGS) $(LIBS)

b33address: $(OBJECTS)
b33address: b33address.o $(I2PD_LIB)
$(CXX) -o b33address b33address.o $(LDFLAGS) $(LIBS)

regaddralias: $(OBJECTS)
regaddralias: regaddralias.o $(I2PD_LIB)
$(CXX) -o regaddralias regaddralias.o $(LDFLAGS) $(LIBS)

$(OBJECTS): libi2pd.a
$(OBJECTS): $(I2PD_LIB)

.SUFFIXES:
.SUFFIXES: .c .cc .C .cpp .o
.SUFFIXES: .c .cc .C .cpp .o

$(I2PD_LIB):
$(MAKE) -C $(I2PD_PATH) mk_obj_dir $(I2PD_LIB)

%.o: %.cpp libi2pd.a
%.o: %.cpp $(I2PD_LIB)
$(CXX) -o $@ -c $(CXXFLAGS) $(INCFLAGS) $<

count:
wc *.c *.cc *.C *.cpp *.h *.hpp

clean: clean-bin clean-obj
clean-i2pd:
$(MAKE) -C $(I2PD_PATH) clean

Expand All @@ -108,3 +109,5 @@ clean: clean-i2pd clean-obj clean-bin
.PHONY: all
.PHONY: count
.PHONY: clean
.PHONY: clean-i2pd
.PHONY: clean-bin
92 changes: 46 additions & 46 deletions common/key.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,72 +10,72 @@
/** @brief returns string representation of a signing key type */
std::string SigTypeToName(uint16_t keytype)
{
switch(keytype) {
case i2p::data::SIGNING_KEY_TYPE_DSA_SHA1:
return "DSA-SHA1";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256:
return "ECDSA-P256";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384:
return "ECDSA-P384";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA512_P521:
return "ECDSA-P521";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048:
return "RSA-2048-SHA256";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072:
return "RSA-3072-SHA384";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096:
return "RSA-4096-SHA512";
case i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519:
return "ED25519-SHA512";
case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256:
return "GOSTR3410-A-GOSTR3411-256";
case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512:
return "GOSTR3410-TC26-A-GOSTR3411-512";
case i2p::data::SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519:
return "RED25519-SHA512";
default:
std::stringstream ss;
ss << "unknown: " << keytype;
return ss.str();
}
switch(keytype) {
case i2p::data::SIGNING_KEY_TYPE_DSA_SHA1:
return "DSA-SHA1";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256:
return "ECDSA-P256";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384:
return "ECDSA-P384";
case i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA512_P521:
return "ECDSA-P521";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048:
return "RSA-2048-SHA256";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072:
return "RSA-3072-SHA384";
case i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096:
return "RSA-4096-SHA512";
case i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519:
return "ED25519-SHA512";
case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256:
return "GOSTR3410-A-GOSTR3411-256";
case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512:
return "GOSTR3410-TC26-A-GOSTR3411-512";
case i2p::data::SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519:
return "RED25519-SHA512";
default:
std::stringstream ss;
ss << "unknown: " << keytype;
return ss.str();
}
}

/** @brief make string uppercase */
static void ToUpper(std::string & str)
{
std::transform(str.begin(), str.end(), str.begin(), [] (uint8_t ch) {
return std::toupper(ch);
});
std::transform(str.begin(), str.end(), str.begin(), [] (uint8_t ch) {
return std::toupper(ch);
});
}
/** @brief returns the signing key number given its name or -1 if there is no key of that type */
uint16_t NameToSigType(const std::string & keyname)
{
if(keyname.size() <= 2) return atoi(keyname.c_str());
if(keyname.size() <= 2) return atoi(keyname.c_str());

std::string name = keyname;
ToUpper(name);
auto npos = std::string::npos;
if(name.find("DSA") == 0) return i2p::data::SIGNING_KEY_TYPE_DSA_SHA1;
std::string name = keyname;
ToUpper(name);
auto npos = std::string::npos;
if(name.find("DSA") == 0) return i2p::data::SIGNING_KEY_TYPE_DSA_SHA1;

if(name.find("P256") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;
if(name.find("P256") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;

if(name.find("P384") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384;
if(name.find("P384") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384;

if(name.find("RSA-SHA265") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048;
if(name.find("RSA-SHA265") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048;

if(name.find("RSA-SHA384") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072;
if(name.find("RSA-SHA384") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072;

if(name.find("RSA-SHA512") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096;
if(name.find("RSA-SHA512") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096;

if(name.find("ED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
if(name.find("ED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;

if(name.find("GOSTR3410-A-GOSTR3411-256") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256;
if(name.find("GOSTR3410-A-GOSTR3411-256") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256;

if(name.find("GOSTR3410-TC26-A-GOSTR3411-512") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512;
if(name.find("GOSTR3410-TC26-A-GOSTR3411-512") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512;

if(name.find("RED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519;
if(name.find("RED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519;

return -1;
return -1;
}

#endif
2 changes: 1 addition & 1 deletion i2pd
Submodule i2pd updated 11 files
+6 −9 Win32/Win32App.cpp
+2 −0 Win32/Win32App.h
+12 −2 daemon/HTTPServer.cpp
+8 −0 libi2pd/CPU.cpp
+43 −15 libi2pd/NetDb.cpp
+8 −1 libi2pd/NetDb.hpp
+7 −2 libi2pd/RouterContext.cpp
+16 −12 libi2pd/Tunnel.cpp
+2 −2 libi2pd/Tunnel.h
+37 −11 libi2pd/TunnelPool.cpp
+4 −0 libi2pd/TunnelPool.h
1 change: 0 additions & 1 deletion websocket-ui/.gitignore
View file

This file was deleted.

44 changes: 0 additions & 44 deletions websocket-ui/index.html
View file

This file was deleted.

45 changes: 0 additions & 45 deletions websocket-ui/leftpad.js
View file

This file was deleted.

11 changes: 0 additions & 11 deletions websocket-ui/readme.md
View file

This file was deleted.

Loading

0 comments on commit 07c5391

Please sign in to comment.