Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 459 insertions, 0 deletions

diff --git a/security/nss/cmd/makepqg/Makefile b/security/nss/cmd/makepqg/Makefile
new file mode 100644
index 0000000000..8b239d2f5e
--- /dev/null
+++ b/security/nss/cmd/makepqg/Makefile
@@ -0,0 +1,49 @@
+#! 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/makepqg/makepqg.c b/security/nss/cmd/makepqg/makepqg.c
new file mode 100644
index 0000000000..edc023e483
--- /dev/null
+++ b/security/nss/cmd/makepqg/makepqg.c
@@ -0,0 +1,353 @@
+/* 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 "prtypes.h"
+#include "prtime.h"
+#include "prlong.h"
+
+#include "nss.h"
+#include "secutil.h"
+#include "secitem.h"
+#include "pk11func.h"
+#include "pk11pqg.h"
+
+#if defined(XP_UNIX)
+#include <unistd.h>
+#endif
+
+#include "plgetopt.h"
+
+#define BPB 8 /* bits per byte. */
+
+char *progName;
+
+const SEC_ASN1Template seckey_PQGParamsTemplate[] = {
+    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPQGParams) },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams, prime) },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams, subPrime) },
+    { SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams, base) },
+    { 0 }
+};
+
+void
+Usage(void)
+{
+    fprintf(stderr, "Usage:  %s\n", progName);
+    fprintf(stderr,
+            "-a   Output DER-encoded PQG params, BTOA encoded.\n"
+            "-b   Output DER-encoded PQG params in binary\n"
+            "-r   Output P, Q and G in ASCII hexadecimal. \n"
+            "  -l prime-length       Length of prime in bits (1024 is default)\n"
+            "  -n subprime-length    Length of subprime in bits\n"
+            "  -o file               Output to this file (default is stdout)\n"
+            "  -g bits               Generate SEED this many bits long.\n");
+    exit(-1);
+}
+
+SECStatus
+outputPQGParams(PQGParams *pqgParams, PRBool output_binary, PRBool output_raw,
+                FILE *outFile)
+{
+    PLArenaPool *arena = NULL;
+    char *PQG;
+    SECItem *pItem;
+    int cc;
+    SECStatus rv;
+    SECItem encodedParams;
+
+    if (output_raw) {
+        SECItem item;
+
+        rv = PK11_PQG_GetPrimeFromParams(pqgParams, &item);
+        if (rv) {
+            SECU_PrintError(progName, "PK11_PQG_GetPrimeFromParams");
+            return rv;
+        }
+        SECU_PrintInteger(outFile, &item, "Prime", 1);
+        SECITEM_FreeItem(&item, PR_FALSE);
+
+        rv = PK11_PQG_GetSubPrimeFromParams(pqgParams, &item);
+        if (rv) {
+            SECU_PrintError(progName, "PK11_PQG_GetPrimeFromParams");
+            return rv;
+        }
+        SECU_PrintInteger(outFile, &item, "Subprime", 1);
+        SECITEM_FreeItem(&item, PR_FALSE);
+
+        rv = PK11_PQG_GetBaseFromParams(pqgParams, &item);
+        if (rv) {
+            SECU_PrintError(progName, "PK11_PQG_GetPrimeFromParams");
+            return rv;
+        }
+        SECU_PrintInteger(outFile, &item, "Base", 1);
+        SECITEM_FreeItem(&item, PR_FALSE);
+
+        fprintf(outFile, "\n");
+        return SECSuccess;
+    }
+
+    encodedParams.data = NULL;
+    encodedParams.len = 0;
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (!arena) {
+        SECU_PrintError(progName, "PORT_NewArena");
+        return SECFailure;
+    }
+    pItem = SEC_ASN1EncodeItem(arena, &encodedParams, pqgParams,
+                               seckey_PQGParamsTemplate);
+    if (!pItem) {
+        SECU_PrintError(progName, "SEC_ASN1EncodeItem");
+        PORT_FreeArena(arena, PR_FALSE);
+        return SECFailure;
+    }
+    if (output_binary) {
+        size_t len;
+        len = fwrite(encodedParams.data, 1, encodedParams.len, outFile);
+        PORT_FreeArena(arena, PR_FALSE);
+        if (len != encodedParams.len) {
+            fprintf(stderr, "%s: fwrite failed\n", progName);
+            return SECFailure;
+        }
+        return SECSuccess;
+    }
+
+    /* must be output ASCII */
+    PQG = BTOA_DataToAscii(encodedParams.data, encodedParams.len);
+    PORT_FreeArena(arena, PR_FALSE);
+    if (!PQG) {
+        SECU_PrintError(progName, "BTOA_DataToAscii");
+        return SECFailure;
+    }
+
+    cc = fprintf(outFile, "%s\n", PQG);
+    PORT_Free(PQG);
+    if (cc <= 0) {
+        fprintf(stderr, "%s: fprintf failed\n", progName);
+        return SECFailure;
+    }
+    return SECSuccess;
+}
+
+SECStatus
+outputPQGVerify(PQGVerify *pqgVerify, PRBool output_binary, PRBool output_raw,
+                FILE *outFile)
+{
+    SECStatus rv = SECSuccess;
+    if (output_raw) {
+        SECItem item;
+        unsigned int counter;
+
+        rv = PK11_PQG_GetHFromVerify(pqgVerify, &item);
+        if (rv) {
+            SECU_PrintError(progName, "PK11_PQG_GetHFromVerify");
+            return rv;
+        }
+        SECU_PrintInteger(outFile, &item, "h", 1);
+        SECITEM_FreeItem(&item, PR_FALSE);
+
+        rv = PK11_PQG_GetSeedFromVerify(pqgVerify, &item);
+        if (rv) {
+            SECU_PrintError(progName, "PK11_PQG_GetSeedFromVerify");
+            return rv;
+        }
+        SECU_PrintInteger(outFile, &item, "SEED", 1);
+        fprintf(outFile, "    g:       %d\n", item.len * BPB);
+        SECITEM_FreeItem(&item, PR_FALSE);
+
+        counter = PK11_PQG_GetCounterFromVerify(pqgVerify);
+        fprintf(outFile, "    counter: %d\n", counter);
+        fprintf(outFile, "\n");
+    }
+    return rv;
+}
+
+int
+main(int argc, char **argv)
+{
+    FILE *outFile = NULL;
+    char *outFileName = NULL;
+    PQGParams *pqgParams = NULL;
+    PQGVerify *pqgVerify = NULL;
+    int keySizeInBits = 1024;
+    int j = 8;
+    int g = 0;
+    int gMax = 0;
+    int qSizeInBits = 0;
+    SECStatus rv = 0;
+    SECStatus passed = 0;
+    PRBool output_ascii = PR_FALSE;
+    PRBool output_binary = PR_FALSE;
+    PRBool output_raw = PR_FALSE;
+    PLOptState *optstate;
+    PLOptStatus status;
+
+    progName = strrchr(argv[0], '/');
+    if (!progName)
+        progName = strrchr(argv[0], '\\');
+    progName = progName ? progName + 1 : argv[0];
+
+    /* Parse command line arguments */
+    optstate = PL_CreateOptState(argc, argv, "?abg:l:n:o:r");
+    while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
+        switch (optstate->option) {
+
+            case 'l':
+                keySizeInBits = atoi(optstate->value);
+                break;
+
+            case 'n':
+                qSizeInBits = atoi(optstate->value);
+                break;
+
+            case 'a':
+                output_ascii = PR_TRUE;
+                break;
+
+            case 'b':
+                output_binary = PR_TRUE;
+                break;
+
+            case 'r':
+                output_raw = PR_TRUE;
+                break;
+
+            case 'o':
+                if (outFileName) {
+                    PORT_Free(outFileName);
+                }
+                outFileName = PORT_Strdup(optstate->value);
+                if (!outFileName) {
+                    rv = -1;
+                }
+                break;
+
+            case 'g':
+                g = atoi(optstate->value);
+                break;
+
+            default:
+            case '?':
+                Usage();
+                break;
+        }
+    }
+    PL_DestroyOptState(optstate);
+
+    if (status == PL_OPT_BAD) {
+        Usage();
+    }
+
+    /* exactly 1 of these options must be set. */
+    if (1 != ((output_ascii != PR_FALSE) +
+              (output_binary != PR_FALSE) +
+              (output_raw != PR_FALSE))) {
+        Usage();
+    }
+
+    gMax = 2 * keySizeInBits;
+    if (keySizeInBits < 1024) {
+        j = PQG_PBITS_TO_INDEX(keySizeInBits);
+        if (j < 0) {
+            fprintf(stderr, "%s: Illegal prime length, \n"
+                            "\tacceptable values are between 512 and 1024,\n"
+                            "\tand divisible by 64, or 2048 or 3072\n",
+                    progName);
+            return 2;
+        }
+        gMax = 2048;
+        if ((qSizeInBits != 0) && (qSizeInBits != 160)) {
+            fprintf(stderr, "%s: Illegal subprime length, \n"
+                            "\tonly 160 is acceptible for primes <= 1024\n",
+                    progName);
+            return 2;
+        }
+        /* this forces keysizes less than 1024 into the DSA1 generation
+	 * code. Whether 1024 uses DSA2 or not is triggered by qSizeInBits
+	 * being non-zero. All larger keysizes will use DSA2.
+	 */
+        qSizeInBits = 0;
+    }
+    if (g != 0 && (g < 160 || g >= gMax || g % 8 != 0)) {
+        fprintf(stderr, "%s: Illegal g bits, \n"
+                        "\tacceptable values are between 160 and %d,\n"
+                        "\tand divisible by 8\n",
+                progName, gMax);
+        return 3;
+    }
+
+    if (!rv && outFileName) {
+        outFile = fopen(outFileName, output_binary ? "wb" : "w");
+        if (!outFile) {
+            fprintf(stderr, "%s: unable to open \"%s\" for writing\n",
+                    progName, outFileName);
+            rv = -1;
+        }
+    }
+    if (outFileName) {
+        PORT_Free(outFileName);
+    }
+    if (rv != 0) {
+        return 1;
+    }
+
+    if (outFile == NULL) {
+        outFile = stdout;
+    }
+
+    if (NSS_NoDB_Init(NULL) != SECSuccess) {
+        return 1;
+    }
+
+    if (keySizeInBits > 1024 || qSizeInBits != 0) {
+        rv = PK11_PQG_ParamGenV2((unsigned)keySizeInBits,
+                                 (unsigned)qSizeInBits, (unsigned)(g / 8),
+                                 &pqgParams, &pqgVerify);
+    } else if (g) {
+        rv = PK11_PQG_ParamGenSeedLen((unsigned)j, (unsigned)(g / 8),
+                                      &pqgParams, &pqgVerify);
+    } else {
+        rv = PK11_PQG_ParamGen((unsigned)j, &pqgParams, &pqgVerify);
+    }
+    /* below here, must go to loser */
+
+    if (rv != SECSuccess || pqgParams == NULL || pqgVerify == NULL) {
+        SECU_PrintError(progName, "PQG parameter generation failed.\n");
+        goto loser;
+    }
+    fprintf(stderr, "%s: PQG parameter generation completed.\n", progName);
+
+    rv = outputPQGParams(pqgParams, output_binary, output_raw, outFile);
+    if (rv) {
+        fprintf(stderr, "%s: failed to output PQG params.\n", progName);
+        goto loser;
+    }
+    rv = outputPQGVerify(pqgVerify, output_binary, output_raw, outFile);
+    if (rv) {
+        fprintf(stderr, "%s: failed to output PQG Verify.\n", progName);
+        goto loser;
+    }
+
+    rv = PK11_PQG_VerifyParams(pqgParams, pqgVerify, &passed);
+    if (rv != SECSuccess) {
+        fprintf(stderr, "%s: PQG parameter verification aborted.\n", progName);
+        goto loser;
+    }
+    if (passed != SECSuccess) {
+        fprintf(stderr, "%s: PQG parameters failed verification.\n", progName);
+        goto loser;
+    }
+    fprintf(stderr, "%s: PQG parameters passed verification.\n", progName);
+
+    PK11_PQG_DestroyParams(pqgParams);
+    PK11_PQG_DestroyVerify(pqgVerify);
+    if (NSS_Shutdown() != SECSuccess) {
+        return 1;
+    }
+    return 0;
+
+loser:
+    PK11_PQG_DestroyParams(pqgParams);
+    PK11_PQG_DestroyVerify(pqgVerify);
+    return 1;
+}
diff --git a/security/nss/cmd/makepqg/makepqg.gyp b/security/nss/cmd/makepqg/makepqg.gyp
new file mode 100644
index 0000000000..3ddc34afe4
--- /dev/null
+++ b/security/nss/cmd/makepqg/makepqg.gyp
@@ -0,0 +1,25 @@
+# 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': 'makepqg',
+      'type': 'executable',
+      'sources': [
+        'makepqg.c'
+      ],
+      'dependencies': [
+        '<(DEPTH)/exports.gyp:dbm_exports',
+        '<(DEPTH)/exports.gyp:nss_exports'
+      ]
+    }
+  ],
+  'variables': {
+    'module': 'nss'
+  }
+}
\ No newline at end of file
diff --git a/security/nss/cmd/makepqg/manifest.mn b/security/nss/cmd/makepqg/manifest.mn
new file mode 100644
index 0000000000..f424410bfb
--- /dev/null
+++ b/security/nss/cmd/makepqg/manifest.mn
@@ -0,0 +1,19 @@
+# 
+# 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 = nss
+
+REQUIRES = dbm 
+
+# DIRS = 
+
+CSRCS	=  makepqg.c
+
+PROGRAM	= makepqg
+
+#USE_STATIC_LIBS = 1
+
diff --git a/security/nss/cmd/makepqg/testit.ksh b/security/nss/cmd/makepqg/testit.ksh
new file mode 100644
index 0000000000..e2cdb028bd
--- /dev/null
+++ b/security/nss/cmd/makepqg/testit.ksh
@@ -0,0 +1,13 @@
+# 
+# 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/.
+
+COUNTER=75
+while [ $COUNTER -ge "1" ] 
+do 
+	COUNTER=$(eval expr $COUNTER - 1)
+	echo $COUNTER
+    	*/makepqg.exe -r -l 640 -g 160 || exit 1
+done
+