Merge pull request #16 from i2p/generateKeys

fix public key out put in generateKeys

.gitignore

@@ -1,3 +1,14 @@
 *.o
 libsam3-tests
-*.a
+*.a
+examples/libsam3
+examples/sam3/dgrams
+examples/sam3/dgramc
+examples/sam3/keys
+examples/sam3/keysp
+examples/sam3namelookup
+examples/sam3/streamss
+examples/sam3/streamcs
+examples/sam3/log
+examples/sam3/err
+

Makefile

@@ -16,7 +16,6 @@ OBJS := ${LIB_OBJS} ${TEST_OBJS}
 
 LIB := libsam3.a
 
-
 all: build check
 
 check: libsam3-tests
@@ -34,8 +33,11 @@ clean:
 	rm -f libsam3-tests ${LIB} ${OBJS} examples/sam3/samtest
 
 %.o: %.c Makefile
-	${CC} ${CFLAGS} -c $< -o $@
+	${CC} ${CFLAGS} $(LDFLAGS) -c $< -o $@
 
 fmt:
 	find . -name '*.c' -exec clang-format -i {} \;
 	find . -name '*.h' -exec clang-format -i {} \;
+
+info:
+	@echo $(AR)

README.md

@@ -6,7 +6,7 @@ A C library for the [SAM v3 API](https://geti2p.net/en/docs/api/samv3).
 
 ## Development Status
 
-Unmaintained, but PRs welcome!
+Maintained by idk, PRs are accepted on [I2P gitlab](https://i2pgit.org/i2p-hackers/libsam3)/[I2P gitlab](http://git.idk.i2p/i2p-hackers/libsam3), and on github at the official mirror repository: [i2p/libsam3](https://github.com/i2p/libsam3).
 
 ## Usage
 
@@ -16,3 +16,37 @@ Copy the two files from one of the following locations into your codebase:
 - `src/libsam3a` - Asynchronous implementation.
 
 See `examples/` for how to use various parts of the API.
+
+## Cross-Compiling for Windows from debian:
+
+Set your cross-compiler up:
+
+``` sh
+export CC=x86_64-w64-mingw32-gcc
+export CFLAGS='-Wall -O2 '
+export LDFLAGS='-lmingw32 -lws2_32 -lwsock32 -mwindows'
+```
+
+and run `make build`. Only libsam3 is available for Windows, libsam3a will be
+made available at a later date.
+`
+
+## Linker(Windows)
+
+When building for Windows remember to set the flags to link to the Winsock and Windows
+libraries.
+
+`-lmingw32 -lws2_32 -lwsock32 -mwindows`
+
+This may apply when cross-compiling or compiling from Windows with mingw.
+
+## Cool Projects using libsam3
+
+Are you using libsam3 to provide an a cool I2P based feature to your project? Let us know about it(and how
+it uses libsam3) and we'll think about adding it here*!
+
+ 1. [Retroshare](https://retroshare.cc)
+
+*Projects which are listed here must be actively maintained. Those which intentionally violate
+the law or the rights of a person or persons directly won't be considered. Neither will obvious
+trolling. The maintainer will make the final decision.

examples/sam3/Makefile

@@ -2,7 +2,7 @@ CFLAGS := -Wall -g -O2 -std=gnu99
 
 all: clean examples
 
-examples: example lookup dclient dserver sclient sserver
+examples: example lookup dclient dserver sclient sserver ssserver ssclient
 
 example:
 	${CC} ${CFLAGS} samtest.c -o samtest ../libsam3/libsam3.o
@@ -22,8 +22,20 @@ sclient:
 sserver:
 	${CC} ${CFLAGS} streams.c -o streams ../libsam3/libsam3.o
 
+ssclient:
+	${CC} ${CFLAGS} streamcs.c -o streamcs ../libsam3/libsam3.o
+
+ssserver:
+	${CC} ${CFLAGS} streamss.c -o streamss ../libsam3/libsam3.o
+
+keysp:
+	${CXX} ${CFLAGS} keys.cc -o keysp ../libsam3/libsam3.o
+
+keys:
+	${CC} ${CFLAGS} keys.c -o keys ../libsam3/libsam3.o
+
 clean:
-	rm -f samtest lookup dgramc dgrams streamc streams streams.key test-lookup
+	rm -f samtest lookup dgramc dgrams streamc streams streams.key test-lookup keys keysp
 
 debug:
 	sed -i 's|// libsam3_debug = 1;|libsam3_debug = 1;|g' *.c

examples/sam3/keys.c

@@ -0,0 +1,20 @@
+//#include <string>
+//#include <iostream>
+#include "../libsam3/libsam3.h"
+#include <stdio.h>
+
+int main() {
+  // The session is only usef for transporting the data
+  Sam3Session ss;
+
+  if (0 > sam3GenerateKeys(&ss, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, 4)) {
+    printf("got error");
+    return -1;
+  }
+  printf("\tpubkey: %s \n \tprivkey: %s", ss.pubkey, ss.privkey);
+  /*auto pub = std::string(ss.pubkey);
+  auto priv = std::string(ss.privkey);
+
+  std::cout << "pub  " << pub << std::endl << "priv " << priv << std::endl;*/
+  return 0;
+}

examples/sam3/keys.cc

@@ -0,0 +1,19 @@
+#include <string>
+#include <iostream>
+#include <stdio.h>
+#include "../libsam3/libsam3.h"
+
+int main() {
+	// The session is only usef for transporting the data
+	Sam3Session ss;
+
+	if (0 > sam3GenerateKeys(&ss, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT, Sam3SigType::EdDSA_SHA512_Ed25519)) {
+		printf("got error");
+		return -1;
+	}
+	auto pub = std::string(ss.pubkey);
+	auto priv = std::string(ss.privkey);
+
+	std::cout << "pub  " << pub << std::endl << "priv " << priv << std::endl;
+	return 0;
+} 

examples/sam3/streamcs.c

@@ -0,0 +1,87 @@
+/* This program is free software. It comes without any warranty, to
+ * the extent permitted by applicable law. You can redistribute it
+ * and/or modify it under the terms of the Do What The Fuck You Want
+ * To Public License, Version 2, as published by Sam Hocevar. See
+ * http://sam.zoy.org/wtfpl/COPYING for more details.
+ *
+ * I2P-Bote:
+ * 5m77dFKGEq6~7jgtrfw56q3t~SmfwZubmGdyOLQOPoPp8MYwsZ~pfUCwud6LB1EmFxkm4C3CGlzq-hVs9WnhUV
+ * we are the Borg. */
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../libsam3/libsam3.h"
+
+#define KEYFILE "streams.key"
+
+int main(int argc, char *argv[]) {
+  Sam3Session ses;
+  Sam3Connection *conn;
+  char cmd[1024], destkey[617]; // 616 chars + \0
+  //
+  libsam3_debug = 1;
+  //
+  memset(destkey, 0, sizeof(destkey));
+  //
+  if (argc < 2) {
+    FILE *fl = fopen(KEYFILE, "rb");
+    //
+    if (fl != NULL) {
+      if (fread(destkey, 616, 1, fl) == 1) {
+        fclose(fl);
+        goto ok;
+      }
+      fclose(fl);
+    }
+    printf("usage: streamc PUBKEY\n");
+    return 1;
+  } else {
+    if (!sam3CheckValidKeyLength(argv[1])) {
+      fprintf(stderr, "FATAL: invalid key length! %s %lu\n", argv[1],
+              strlen(argv[1]));
+      return 1;
+    }
+    strcpy(destkey, argv[1]);
+  }
+  //
+ok:
+  printf("creating session...\n");
+  // create TRANSIENT session
+  if (sam3CreateSilentSession(&ses, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT,
+                              SAM3_DESTINATION_TRANSIENT, SAM3_SESSION_STREAM,
+                              4, NULL) < 0) {
+    fprintf(stderr, "FATAL: can't create session\n");
+    return 1;
+  }
+  //
+  printf("connecting...\n");
+  if ((conn = sam3StreamConnect(&ses, destkey)) == NULL) {
+    fprintf(stderr, "FATAL: can't connect: %s\n", ses.error);
+    sam3CloseSession(&ses);
+    return 1;
+  }
+  //
+  // now waiting for incoming connection
+  printf("sending test command...\n");
+  if (sam3tcpPrintf(conn->fd, "test\n") < 0)
+    goto error;
+  if (sam3tcpReceiveStr(conn->fd, cmd, sizeof(cmd)) < 0)
+    goto error;
+  printf("echo: %s\n", cmd);
+  //
+  printf("sending quit command...\n");
+  if (sam3tcpPrintf(conn->fd, "quit\n") < 0)
+    goto error;
+  //
+  sam3CloseConnection(conn);
+  sam3CloseSession(&ses);
+  return 0;
+error:
+  fprintf(stderr, "FATAL: some error occured!\n");
+  sam3CloseConnection(conn);
+  sam3CloseSession(&ses);
+  return 1;
+}

examples/sam3/streamss.c

@@ -0,0 +1,72 @@
+/* This program is free software. It comes without any warranty, to
+ * the extent permitted by applicable law. You can redistribute it
+ * and/or modify it under the terms of the Do What The Fuck You Want
+ * To Public License, Version 2, as published by Sam Hocevar. See
+ * http://sam.zoy.org/wtfpl/COPYING for more details.
+ *
+ * I2P-Bote:
+ * 5m77dFKGEq6~7jgtrfw56q3t~SmfwZubmGdyOLQOPoPp8MYwsZ~pfUCwud6LB1EmFxkm4C3CGlzq-hVs9WnhUV
+ * we are the Borg. */
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "../libsam3/libsam3.h"
+
+#define KEYFILE "streams.key"
+
+int main(int argc, char *argv[]) {
+  Sam3Session ses;
+  Sam3Connection *conn;
+  FILE *fl;
+  //
+  libsam3_debug = 1;
+  //
+  printf("creating session...\n");
+  // create TRANSIENT session
+  if (sam3CreateSilentSession(&ses, SAM3_HOST_DEFAULT, SAM3_PORT_DEFAULT,
+                              SAM3_DESTINATION_TRANSIENT, SAM3_SESSION_STREAM,
+                              4, NULL) < 0) {
+    fprintf(stderr, "FATAL: can't create session\n");
+    return 1;
+  }
+  //
+  printf("PUB KEY\n=======\n%s\n=======\n", ses.pubkey);
+  if ((fl = fopen(KEYFILE, "wb")) != NULL) {
+    fwrite(ses.pubkey, strlen(ses.pubkey), 1, fl);
+    fclose(fl);
+  }
+  //
+  printf("starting stream acceptor...\n");
+  if ((conn = sam3StreamAccept(&ses)) == NULL) {
+    fprintf(stderr, "FATAL: can't accept: %s\n", ses.error);
+    sam3CloseSession(&ses);
+    return 1;
+  }
+  printf("FROM\n====\n%s\n====\n", conn->destkey);
+  //
+  printf("starting main loop...\n");
+  for (;;) {
+    char cmd[256];
+    //
+    if (sam3tcpReceiveStr(conn->fd, cmd, sizeof(cmd)) < 0)
+      goto error;
+    printf("cmd: [%s]\n", cmd);
+    if (strcmp(cmd, "quit") == 0)
+      break;
+    // echo command
+    if (sam3tcpPrintf(conn->fd, "re: %s\n", cmd) < 0)
+      goto error;
+  }
+  //
+  sam3CloseSession(&ses);
+  unlink(KEYFILE);
+  return 0;
+error:
+  fprintf(stderr, "FATAL: some error occured!\n");
+  sam3CloseSession(&ses);
+  unlink(KEYFILE);
+  return 1;
+}

src/libsam3/libsam3.c

@@ -11,7 +11,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <netdb.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -20,12 +19,27 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __MINGW32__
+//#include <winsock.h>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+#ifndef SHUT_RDWR
+#define SHUT_RDWR 2
+#endif
+#endif
+
+#ifdef __unix__
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/sysinfo.h>
 #include <sys/types.h>
-
+#endif
 ////////////////////////////////////////////////////////////////////////////////
 int libsam3_debug = 0;
 
@@ -702,20 +716,23 @@ int sam3GenerateKeys(Sam3Session *ses, const char *hostname, int port,
       return -1;
     }
     //
-    if (sam3tcpPrintf(fd, "DEST GENERATE %s\n", sigtypes[sigType]) >= 0) {
-      if ((rep = sam3ReadReply(fd)) != NULL &&
-          sam3IsGoodReply(rep, "DEST", "REPLY", NULL, NULL)) {
-        const char *pub = sam3FindField(rep, "PUB"),
-                   *priv = sam3FindField(rep, "PRIV");
-        //
-        if (pub != NULL && sam3CheckValidKeyLength(pub) && priv != NULL &&
-            strlen(priv) >= SAM3_PRIVKEY_MIN_SIZE) {
-          strcpy(ses->pubkey, pub);
-          strcpy(ses->privkey, priv);
-          res = 0;
-        }
-      }
+    if (sam3tcpPrintf(fd, "DEST GENERATE\n") < 0) {
+      strcpyerr(ses, "DEST_ERROR");
     }
+
+    rep = sam3ReadReply(fd);
+    // sam3DumpFieldList(rep);
+    if (!sam3IsGoodReply(rep, "DEST", "REPLY", "PUB", NULL)) {
+      strcpyerr(ses, "PUBKEY_ERROR");
+    }
+    if (!sam3IsGoodReply(rep, "DEST", "REPLY", "PRIV", NULL)) {
+      strcpyerr(ses, "PRIVKEY_ERROR");
+    }
+    const char *pub = sam3FindField(rep, "PUB");
+    strcpy(ses->pubkey, pub);
+    const char *priv = sam3FindField(rep, "PRIV");
+    strcpy(ses->privkey, priv);
+    res = 0;
     //
     sam3FreeFieldList(rep);
     sam3tcpDisconnect(fd);
@@ -935,11 +952,9 @@ Sam3Connection *sam3StreamConnect(Sam3Session *ses, const char *destkey) {
       strcpyerr(ses, "IO_ERROR_SK");
       goto error;
     }
-    char silent[6];
-    checkIsSilent(ses, silent);
     if (sam3tcpPrintf(conn->fd,
                       "STREAM CONNECT ID=%s DESTINATION=%s SILENT=%s\n",
-                      ses->channel, destkey, silent) < 0) {
+                      ses->channel, destkey, checkIsSilent(ses)) < 0) {
       strcpyerr(ses, "IO_ERROR");
       goto error;
     }
@@ -947,16 +962,18 @@ Sam3Connection *sam3StreamConnect(Sam3Session *ses, const char *destkey) {
       strcpyerr(ses, "IO_ERROR");
       goto error;
     }
-    if (!sam3IsGoodReply(rep, "STREAM", "STATUS", "RESULT", "OK")) {
-      const char *v = sam3FindField(rep, "RESULT");
-      //
-      strcpyerr(ses, (v != NULL && v[0] ? v : "I2P_ERROR"));
-      sam3CloseConnectionInternal(conn);
-      free(conn);
-      conn = NULL;
-    } else {
-      // no error
-      strcpyerr(ses, NULL);
+    if (!ses->silent) {
+      if (!sam3IsGoodReply(rep, "STREAM", "STATUS", "RESULT", "OK")) {
+        const char *v = sam3FindField(rep, "RESULT");
+        //
+        strcpyerr(ses, (v != NULL && v[0] ? v : "I2P_ERROR"));
+        sam3CloseConnectionInternal(conn);
+        free(conn);
+        conn = NULL;
+      } else {
+        // no error
+        strcpyerr(ses, NULL);
+      }
     }
     sam3FreeFieldList(rep);
     if (conn != NULL) {
@@ -1004,11 +1021,13 @@ Sam3Connection *sam3StreamAccept(Sam3Session *ses) {
       strcpyerr(ses, "IO_ERROR_RP");
       goto error;
     }
-    if (!sam3IsGoodReply(rep, "STREAM", "STATUS", "RESULT", "OK")) {
-      const char *v = sam3FindField(rep, "RESULT");
-      //
-      strcpyerr(ses, (v != NULL && v[0] ? v : "I2P_ERROR_RES"));
-      goto error;
+    if (!ses->silent) {
+      if (!sam3IsGoodReply(rep, "STREAM", "STATUS", "RESULT", "OK")) {
+        const char *v = sam3FindField(rep, "RESULT");
+        //
+        strcpyerr(ses, (v != NULL && v[0] ? v : "I2P_ERROR_RES"));
+        goto error;
+      }
     }
     if (sam3tcpReceiveStr(conn->fd, repstr, sizeof(repstr)) < 0) {
       strcpyerr(ses, "IO_ERROR_RP1");
@@ -1042,11 +1061,11 @@ Sam3Connection *sam3StreamAccept(Sam3Session *ses) {
   return NULL;
 }
 
-void checkIsSilent(Sam3Session *ses, char *str) {
+const char *checkIsSilent(Sam3Session *ses) {
   if (ses->silent == true) {
-    str = "true ";
+    return "true";
   } else {
-    str = "false";
+    return "false";
   }
 }
 
@@ -1070,11 +1089,9 @@ int sam3StreamForward(Sam3Session *ses, const char *hostname, int port) {
       strcpyerr(ses, "IO_ERROR_SK");
       goto error;
     }
-    char silent[6];
-    checkIsSilent(ses, silent);
     if (sam3tcpPrintf(ses->fwd_fd,
                       "STREAM FORWARD ID=%s PORT=%d HOST=%s SILENT=%s\n",
-                      ses->channel, port, hostname, silent) < 0) {
+                      ses->channel, port, hostname, checkIsSilent(ses)) < 0) {
       strcpyerr(ses, "IO_ERROR_PF");
       goto error;
     }

src/libsam3/libsam3.h

@@ -10,9 +10,18 @@
 #ifndef LIBSAM3_H
 #define LIBSAM3_H
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
+
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+#undef ssize_t
+#ifdef _WIN64
+typedef signed int64 ssize_t;
+typedef int ssize_t;
+#endif /* _WIN64 */
+#endif /* _SSIZE_T_DEFINED */
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,7 +205,7 @@ extern int sam3CloseSession(Sam3Session *ses);
  * characters for use with sam3tcpPrintf() checkIsSilent
  */
 
-void checkIsSilent(Sam3Session *ses, char *str);
+const char *checkIsSilent(Sam3Session *ses);
 
 /*
  * Check to make sure that the destination in use is of a valid length, returns

src/libsam3a/libsam3a.c

@@ -13,7 +13,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <netdb.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -22,13 +21,28 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __MINGW32__
+//#include <winsock.h>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+#ifndef SHUT_RDWR
+#define SHUT_RDWR 2
+#endif
+#endif
+
+#ifdef __unix__
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysinfo.h>
 #include <sys/types.h>
-
+#endif
 ////////////////////////////////////////////////////////////////////////////////
 int libsam3a_debug = 0;
 

src/libsam3a/libsam3a.h

@@ -18,6 +18,17 @@
 
 #include <sys/types.h>
 
+#ifdef __MINGW32__
+//#include <winsock.h>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+//#define SOCK_CLOEXEC O_CLOEXEC
+//#define SOCK_NONBLOCK O_NONBLOCK
+#define SOCK_CLOEXEC 02000000
+#define SOCK_NONBLOCK FIONBIO
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif