diff options
Diffstat (limited to 'package/utils/px5g')
| -rw-r--r-- | package/utils/px5g/Makefile | 7 | ||||
| -rw-r--r-- | package/utils/px5g/px5g.c | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index 9c0caa7..8677a8b 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org> +# Copyright (C) 2010-2015 Jo-Philipp Wich <jow@openwrt.org> # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,9 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g -PKG_RELEASE:=1 +PKG_RELEASE:=3 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT) PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk @@ -19,7 +18,7 @@ define Package/px5g SECTION:=utils CATEGORY:=Utilities TITLE:=X.509 certificate generator (using PolarSSL) - MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org> + MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> DEPENDS:=+libpolarssl endef diff --git a/package/utils/px5g/px5g.c b/package/utils/px5g/px5g.c index 6b97708..eec8fd3 100644 --- a/package/utils/px5g/px5g.c +++ b/package/utils/px5g/px5g.c @@ -143,7 +143,7 @@ int selfsigned(char **arg) char *keypath = NULL, *certpath = NULL; bool pem = true; time_t from = time(NULL), to; - char fstr[20], tstr[20]; + char fstr[20], tstr[20], sstr[17]; int len; while (*arg && **arg == '-') { @@ -188,7 +188,7 @@ int selfsigned(char **arg) } memcpy(newc, oldc, delim - oldc); newc += delim - oldc; - *newc++ = ';'; + *newc++ = ','; oldc = delim + 1; } while(*delim); arg++; @@ -222,8 +222,12 @@ int selfsigned(char **arg) x509write_crt_set_subject_key_identifier(&cert); x509write_crt_set_authority_key_identifier(&cert); + _urandom(NULL, buf, 8); + for (len = 0; len < 8; len++) + sprintf(sstr + len*2, "%02x", (unsigned char) buf[len]); + mpi_init(&serial); - mpi_read_string(&serial, 10, "1"); + mpi_read_string(&serial, 16, sstr); x509write_crt_set_serial(&cert, &serial); if (pem) { |