]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
px5g: rename the old package to px5g-standalone, add a new one that links against...
authorFelix Fietkau <nbd@openwrt.org>
Fri, 21 Mar 2014 15:55:23 +0000 (15:55 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Fri, 21 Mar 2014 15:55:23 +0000 (15:55 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40000

21 files changed:
package/utils/px5g-standalone/Makefile [new file with mode: 0644]
package/utils/px5g-standalone/src/Makefile [moved from package/utils/px5g/src/Makefile with 100% similarity]
package/utils/px5g-standalone/src/library/base64.c [moved from package/utils/px5g/src/library/base64.c with 100% similarity]
package/utils/px5g-standalone/src/library/bignum.c [moved from package/utils/px5g/src/library/bignum.c with 100% similarity]
package/utils/px5g-standalone/src/library/havege.c [moved from package/utils/px5g/src/library/havege.c with 100% similarity]
package/utils/px5g-standalone/src/library/rsa.c [moved from package/utils/px5g/src/library/rsa.c with 100% similarity]
package/utils/px5g-standalone/src/library/sha1.c [moved from package/utils/px5g/src/library/sha1.c with 100% similarity]
package/utils/px5g-standalone/src/library/timing.c [moved from package/utils/px5g/src/library/timing.c with 100% similarity]
package/utils/px5g-standalone/src/library/x509write.c [moved from package/utils/px5g/src/library/x509write.c with 100% similarity]
package/utils/px5g-standalone/src/polarssl/base64.h [moved from package/utils/px5g/src/polarssl/base64.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/bignum.h [moved from package/utils/px5g/src/polarssl/bignum.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/bn_mul.h [moved from package/utils/px5g/src/polarssl/bn_mul.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/config.h [moved from package/utils/px5g/src/polarssl/config.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/havege.h [moved from package/utils/px5g/src/polarssl/havege.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/rsa.h [moved from package/utils/px5g/src/polarssl/rsa.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/sha1.h [moved from package/utils/px5g/src/polarssl/sha1.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/timing.h [moved from package/utils/px5g/src/polarssl/timing.h with 100% similarity]
package/utils/px5g-standalone/src/polarssl/x509.h [moved from package/utils/px5g/src/polarssl/x509.h with 100% similarity]
package/utils/px5g-standalone/src/px5g.c [moved from package/utils/px5g/src/px5g.c with 100% similarity]
package/utils/px5g/Makefile
package/utils/px5g/px5g.c [new file with mode: 0644]

diff --git a/package/utils/px5g-standalone/Makefile b/package/utils/px5g-standalone/Makefile
new file mode 100644 (file)
index 0000000..2577796
--- /dev/null
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=px5g
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/px5g-standalone
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Standalone X.509 certificate generator (standalone version)
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+endef
+
+define Package/px5g-standalone/description
+ Px5g is a tiny standalone X.509 certificate generator.
+ It suitable to create key files and certificates in DER
+ and PEM format for use with stunnel, uhttpd and others.
+endef
+
+define Build/Prepare
+       mkdir -p $(PKG_BUILD_DIR)
+       $(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/px5g-standalone/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/px5g $(1)/usr/sbin/px5g
+endef
+
+$(eval $(call BuildPackage,px5g-standalone))
index ad4ec4058081cce9b7233e762d2d15f3e69ca1bd..9c0caa7b8d22938a35c93f2ac9d4ce6d62bbaf93 100644 (file)
@@ -10,15 +10,17 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=px5g
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/px5g
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Standalone X.509 certificate generator
+  TITLE:=X.509 certificate generator (using PolarSSL)
   MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  DEPENDS:=+libpolarssl
 endef
 
 define Package/px5g/description
@@ -29,7 +31,10 @@ endef
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
-       $(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+       $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/px5g px5g.c -lpolarssl
 endef
 
 define Package/px5g/install
diff --git a/package/utils/px5g/px5g.c b/package/utils/px5g/px5g.c
new file mode 100644 (file)
index 0000000..6b97708
--- /dev/null
@@ -0,0 +1,269 @@
+/*
+ * px5g - Embedded x509 key and certificate generator based on PolarSSL
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License, version 2.1 as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdbool.h>
+
+#include <polarssl/bignum.h>
+#include <polarssl/x509_crt.h>
+#include <polarssl/rsa.h>
+
+#define PX5G_VERSION "0.2"
+#define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>"
+#define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1"
+
+static int urandom_fd;
+static char buf[16384];
+
+static int _urandom(void *ctx, unsigned char *out, size_t len)
+{
+       read(urandom_fd, out, len);
+       return 0;
+}
+
+static void write_file(const char *path, int len, bool pem)
+{
+       FILE *f = stdout;
+       const char *buf_start = buf;
+
+       if (!pem)
+               buf_start += sizeof(buf) - len;
+
+       if (!len) {
+               fprintf(stderr, "No data to write\n");
+               exit(1);
+       }
+
+       if (!f) {
+               fprintf(stderr, "error: I/O error\n");
+               exit(1);
+       }
+
+       if (path)
+               f = fopen(path, "w");
+
+       fwrite(buf_start, 1, len, f);
+       fclose(f);
+}
+
+static void write_key(pk_context *key, const char *path, bool pem)
+{
+       int len = 0;
+
+       if (pem) {
+               if (pk_write_key_pem(key, (void *) buf, sizeof(buf)) == 0)
+                       len = strlen(buf);
+       } else {
+               len = pk_write_key_der(key, (void *) buf, sizeof(buf));
+               if (len < 0)
+                       len = 0;
+       }
+
+       write_file(path, len, pem);
+}
+
+static void gen_key(pk_context *key, int ksize, int exp, bool pem)
+{
+       pk_init(key);
+       pk_init_ctx(key, pk_info_from_type(POLARSSL_PK_RSA));
+       fprintf(stderr, "Generating RSA private key, %i bit long modulus\n", ksize);
+       if (rsa_gen_key(pk_rsa(*key), _urandom, NULL, ksize, exp)) {
+               fprintf(stderr, "error: key generation failed\n");
+               exit(1);
+       }
+}
+
+int rsakey(char **arg)
+{
+       pk_context key;
+       unsigned int ksize = 512;
+       int exp = 65537;
+       char *path = NULL;
+       bool pem = true;
+
+       while (*arg && **arg == '-') {
+               if (!strcmp(*arg, "-out") && arg[1]) {
+                       path = arg[1];
+                       arg++;
+               } else if (!strcmp(*arg, "-3")) {
+                       exp = 3;
+               } else if (!strcmp(*arg, "-der")) {
+                       pem = false;
+               }
+               arg++;
+       }
+
+       if (*arg)
+               ksize = (unsigned int)atoi(*arg);
+
+       gen_key(&key, ksize, exp, pem);
+       write_key(&key, path, pem);
+
+       pk_free(&key);
+
+       return 0;
+}
+
+int selfsigned(char **arg)
+{
+       pk_context key;
+       x509write_cert cert;
+       mpi serial;
+
+       char *subject = "";
+       unsigned int ksize = 512;
+       int exp = 65537;
+       unsigned int days = 30;
+       char *keypath = NULL, *certpath = NULL;
+       bool pem = true;
+       time_t from = time(NULL), to;
+       char fstr[20], tstr[20];
+       int len;
+
+       while (*arg && **arg == '-') {
+               if (!strcmp(*arg, "-der")) {
+                       pem = false;
+               } else if (!strcmp(*arg, "-newkey") && arg[1]) {
+                       if (strncmp(arg[1], "rsa:", 4)) {
+                               fprintf(stderr, "error: invalid algorithm");
+                               return 1;
+                       }
+                       ksize = (unsigned int)atoi(arg[1] + 4);
+                       arg++;
+               } else if (!strcmp(*arg, "-days") && arg[1]) {
+                       days = (unsigned int)atoi(arg[1]);
+                       arg++;
+               } else if (!strcmp(*arg, "-keyout") && arg[1]) {
+                       keypath = arg[1];
+                       arg++;
+               } else if (!strcmp(*arg, "-out") && arg[1]) {
+                       certpath = arg[1];
+                       arg++;
+               } else if (!strcmp(*arg, "-subj") && arg[1]) {
+                       if (arg[1][0] != '/' || strchr(arg[1], ';')) {
+                               fprintf(stderr, "error: invalid subject");
+                               return 1;
+                       }
+                       subject = calloc(strlen(arg[1]) + 1, 1);
+                       char *oldc = arg[1] + 1, *newc = subject, *delim;
+                       do {
+                               delim = strchr(oldc, '=');
+                               if (!delim) {
+                                       fprintf(stderr, "error: invalid subject");
+                                       return 1;
+                               }
+                               memcpy(newc, oldc, delim - oldc + 1);
+                               newc += delim - oldc + 1;
+                               oldc = delim + 1;
+
+                               delim = strchr(oldc, '/');
+                               if (!delim) {
+                                       delim = arg[1] + strlen(arg[1]);
+                               }
+                               memcpy(newc, oldc, delim - oldc);
+                               newc += delim - oldc;
+                               *newc++ = ';';
+                               oldc = delim + 1;
+                       } while(*delim);
+                       arg++;
+               }
+               arg++;
+       }
+
+       gen_key(&key, ksize, exp, pem);
+
+       if (keypath)
+               write_key(&key, keypath, pem);
+
+       from = (from < 1000000000) ? 1000000000 : from;
+       strftime(fstr, sizeof(fstr), "%Y%m%d%H%M%S", gmtime(&from));
+       to = from + 60 * 60 * 24 * days;
+       if (to < from)
+               to = INT_MAX;
+       strftime(tstr, sizeof(tstr), "%Y%m%d%H%M%S", gmtime(&to));
+
+       fprintf(stderr, "Generating selfsigned certificate with subject '%s'"
+                       " and validity %s-%s\n", subject, fstr, tstr);
+
+       x509write_crt_init(&cert);
+       x509write_crt_set_md_alg(&cert, POLARSSL_MD_SHA1);
+       x509write_crt_set_issuer_key(&cert, &key);
+       x509write_crt_set_subject_key(&cert, &key);
+       x509write_crt_set_subject_name(&cert, subject);
+       x509write_crt_set_issuer_name(&cert, subject);
+       x509write_crt_set_validity(&cert, fstr, tstr);
+       x509write_crt_set_basic_constraints(&cert, 0, -1);
+       x509write_crt_set_subject_key_identifier(&cert);
+       x509write_crt_set_authority_key_identifier(&cert);
+
+       mpi_init(&serial);
+       mpi_read_string(&serial, 10, "1");
+       x509write_crt_set_serial(&cert, &serial);
+
+       if (pem) {
+               if (x509write_crt_pem(&cert, (void *) buf, sizeof(buf), _urandom, NULL) < 0) {
+                       fprintf(stderr, "Failed to generate certificate\n");
+                       return 1;
+               }
+
+               len = strlen(buf);
+       } else {
+               len = x509write_crt_der(&cert, (void *) buf, sizeof(buf), _urandom, NULL);
+               if (len < 0) {
+                       fprintf(stderr, "Failed to generate certificate: %d\n", len);
+                       return 1;
+               }
+       }
+       write_file(certpath, len, pem);
+
+       x509write_crt_free(&cert);
+       mpi_free(&serial);
+       pk_free(&key);
+
+       return 0;
+}
+
+int main(int argc, char *argv[])
+{
+       urandom_fd = open("/dev/urandom", O_RDONLY);
+
+       if (!argv[1]) {
+               //Usage
+       } else if (!strcmp(argv[1], "rsakey")) {
+               return rsakey(argv+2);
+       } else if (!strcmp(argv[1], "selfsigned")) {
+               return selfsigned(argv+2);
+       }
+
+       fprintf(stderr,
+               "PX5G X.509 Certificate Generator Utility v" PX5G_VERSION "\n" PX5G_COPY
+               "\nbased on PolarSSL by Christophe Devine and Paul Bakker\n\n");
+       fprintf(stderr, "Usage: %s [rsakey|selfsigned]\n", *argv);
+       return 1;
+}