Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/softoken/pkcs11c.c

 /* 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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 35 matching lines @@
 #undef CK_NEED_ARG_LIST
 
 #define CK_EXTERN extern
 #define CK_PKCS11_FUNCTION_INFO(func) \
                 CK_RV __PASTE(NS,func)
 #define CK_NEED_ARG_LIST        1
  
 #include "pkcs11f.h"
 
 typedef struct {
-    uint8 client_version[2];
-    uint8 random[46];
+    PRUint8 client_version[2];
+    PRUint8 random[46];
 } SSL3RSAPreMasterSecret;
 
 static void sftk_Null(void *data, PRBool freeit)
 {
     return;
 } 
 
 #ifdef NSS_ENABLE_ECC
 #ifdef EC_DEBUG
 #define SEC_PRINT(str1, str2, num, sitem) \
@@ skipping 3212 matching lines @@
 
     return crv;
 }
 
 CK_RV
 nsc_SetupHMACKeyGen(CK_MECHANISM_PTR pMechanism, NSSPKCS5PBEParameter **pbe)
 {
     SECItem  salt;
     CK_PBE_PARAMS *pbe_params = NULL;
     NSSPKCS5PBEParameter *params;
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     SECStatus rv;
 
     *pbe = NULL;
 
     arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
     if (arena == NULL) {
         return CKR_HOST_MEMORY;
     }
 
     params = (NSSPKCS5PBEParameter *) PORT_ArenaZAlloc(arena,
@@ skipping 2029 matching lines @@
  *  SharedSecret: a shared secret that is the output of a key agreement primitive.
  *  SharedInfo: (Optional) some data shared by the entities computing the secret key.
  *  SharedInfoLen: the length in octets of SharedInfo
  *  Hash: The hash function to be used in the KDF
  *  HashLen: the length in octets of the output of Hash
  * Output:
  *  key: Pointer to a buffer containing derived key, if return value is SECSuccess.
  */
 static CK_RV sftk_compute_ANSI_X9_63_kdf(CK_BYTE **key, CK_ULONG key_len, SECItem *SharedSecret,
                 CK_BYTE_PTR SharedInfo, CK_ULONG SharedInfoLen,
-                SECStatus Hash(unsigned char *, const unsigned char *, uint32),
+                SECStatus Hash(unsigned char *, const unsigned char *, PRUint32),
                 CK_ULONG HashLen)
 {
     unsigned char *buffer = NULL, *output_buffer = NULL;
-    uint32 buffer_len, max_counter, i;
+    PRUint32 buffer_len, max_counter, i;
     SECStatus rv;
 
     /* Check that key_len isn't too long.  The maximum key length could be
      * greatly increased if the code below did not limit the 4-byte counter
      * to a maximum value of 255. */
     if (key_len > 254 * HashLen)
         return SEC_ERROR_INVALID_ARGS;
 
     if (SharedInfo == NULL)
         SharedInfoLen = 0;
@@ skipping 1592 matching lines @@
     att = sftk_FindAttribute(key,CKA_VALUE);
     sftk_FreeObject(key);
     if (!att) {
         return CKR_KEY_HANDLE_INVALID;        
     }
     crv = NSC_DigestUpdate(hSession,(CK_BYTE_PTR)att->attrib.pValue,
                            att->attrib.ulValueLen);
     sftk_FreeAttribute(att);
     return crv;
 }