From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- security/nss/cmd/derdump/Makefile | 48 +++++++++++++ security/nss/cmd/derdump/derdump.c | 128 +++++++++++++++++++++++++++++++++++ security/nss/cmd/derdump/derdump.gyp | 30 ++++++++ security/nss/cmd/derdump/manifest.mn | 21 ++++++ 4 files changed, 227 insertions(+) create mode 100644 security/nss/cmd/derdump/Makefile create mode 100644 security/nss/cmd/derdump/derdump.c create mode 100644 security/nss/cmd/derdump/derdump.gyp create mode 100644 security/nss/cmd/derdump/manifest.mn (limited to 'security/nss/cmd/derdump') diff --git a/security/nss/cmd/derdump/Makefile b/security/nss/cmd/derdump/Makefile new file mode 100644 index 0000000000..c2039d82b6 --- /dev/null +++ b/security/nss/cmd/derdump/Makefile @@ -0,0 +1,48 @@ +#! gmake +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORE_DEPTH)/coreconf/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include ../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORE_DEPTH)/coreconf/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + + + +include ../platrules.mk + diff --git a/security/nss/cmd/derdump/derdump.c b/security/nss/cmd/derdump/derdump.c new file mode 100644 index 0000000000..d687a8b7ad --- /dev/null +++ b/security/nss/cmd/derdump/derdump.c @@ -0,0 +1,128 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "secutil.h" +#include "nss.h" +#include + +#if defined(XP_WIN) || (defined(__sun) && !defined(SVR4)) +#if !defined(WIN32) +extern int fprintf(FILE *, char *, ...); +#endif +#endif +#include "plgetopt.h" + +static void +Usage(char *progName) +{ + fprintf(stderr, + "Usage: %s [-r] [-i input] [-o output]\n", + progName); + fprintf(stderr, "%-20s For formatted items, dump raw bytes as well\n", + "-r"); + fprintf(stderr, "%-20s Define an input file to use (default is stdin)\n", + "-i input"); + fprintf(stderr, "%-20s Define an output file to use (default is stdout)\n", + "-o output"); + exit(-1); +} + +int +main(int argc, char **argv) +{ + char *progName; + FILE *outFile; + PRFileDesc *inFile; + SECItem der = { siBuffer, NULL, 0 }; + SECStatus rv; + PRInt16 xp_error; + PRBool raw = PR_FALSE; + PLOptState *optstate; + PLOptStatus status; + int retval = -1; + + progName = strrchr(argv[0], '/'); + progName = progName ? progName + 1 : argv[0]; + + /* Parse command line arguments */ + inFile = 0; + outFile = 0; + optstate = PL_CreateOptState(argc, argv, "i:o:r"); + while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) { + switch (optstate->option) { + case 'i': + inFile = PR_Open(optstate->value, PR_RDONLY, 0); + if (!inFile) { + fprintf(stderr, "%s: unable to open \"%s\" for reading\n", + progName, optstate->value); + goto cleanup; + } + break; + + case 'o': + outFile = fopen(optstate->value, "w"); + if (!outFile) { + fprintf(stderr, "%s: unable to open \"%s\" for writing\n", + progName, optstate->value); + goto cleanup; + } + break; + + case 'r': + raw = PR_TRUE; + break; + + default: + Usage(progName); + break; + } + } + if (status == PL_OPT_BAD) + Usage(progName); + + if (!inFile) + inFile = PR_STDIN; + if (!outFile) + outFile = stdout; + + rv = NSS_NoDB_Init(NULL); + if (rv != SECSuccess) { + SECU_PrintPRandOSError(progName); + goto cleanup; + } + + rv = SECU_ReadDERFromFile(&der, inFile, PR_FALSE, PR_FALSE); + if (rv == SECSuccess) { + rv = DER_PrettyPrint(outFile, &der, raw); + if (rv == SECSuccess) { + retval = 0; + goto cleanup; + } + } + + xp_error = PORT_GetError(); + if (xp_error) { + SECU_PrintError(progName, "error %d", xp_error); + } + if (errno) { + SECU_PrintSystemError(progName, "errno=%d", errno); + } + retval = 1; + +cleanup: + retval |= NSS_Shutdown(); + if (inFile) { + PR_Close(inFile); + } + if (outFile) { + fflush(outFile); + fclose(outFile); + } + PL_DestroyOptState(optstate); + if (der.data) { + PORT_Free(der.data); + } + + return retval; +} diff --git a/security/nss/cmd/derdump/derdump.gyp b/security/nss/cmd/derdump/derdump.gyp new file mode 100644 index 0000000000..5637685da9 --- /dev/null +++ b/security/nss/cmd/derdump/derdump.gyp @@ -0,0 +1,30 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +{ + 'includes': [ + '../../coreconf/config.gypi', + '../../cmd/platlibs.gypi' + ], + 'targets': [ + { + 'target_name': 'derdump', + 'type': 'executable', + 'sources': [ + 'derdump.c' + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:dbm_exports', + '<(DEPTH)/exports.gyp:nss_exports' + ] + } + ], + 'target_defaults': { + 'defines': [ + 'NSPR20' + ] + }, + 'variables': { + 'module': 'nss' + } +} \ No newline at end of file diff --git a/security/nss/cmd/derdump/manifest.mn b/security/nss/cmd/derdump/manifest.mn new file mode 100644 index 0000000000..0b550377c5 --- /dev/null +++ b/security/nss/cmd/derdump/manifest.mn @@ -0,0 +1,21 @@ +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +CORE_DEPTH = ../.. + +# MODULE public and private header directories are implicitly REQUIRED. +MODULE = nss + +# This next line is used by .mk files +# and gets translated into $LINCS in manifest.mnw +# The MODULE is always implicitly required. +# Listing it here in REQUIRES makes it appear twice in the cc command line. +REQUIRES = seccmd dbm + +DEFINES = -DNSPR20 + +CSRCS = derdump.c + +PROGRAM = derdump -- cgit v1.2.3