Update to NSS 3.16.2 Beta 3.

nss/lib/pk11wrap/secmod.h

 /* 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/. */
 #ifndef _SECMOD_H_
 #define _SECMOD_H_
 #include "seccomon.h"
 #include "secmodt.h"
 #include "prinrval.h"
 
 /* These mechanisms flags are visible to all other libraries. */
@@ skipping 10 matching lines @@
 #define PUBLIC_MECH_SHA1_FLAG        0x00000100ul
 #define PUBLIC_MECH_MD5_FLAG         0x00000200ul
 #define PUBLIC_MECH_MD2_FLAG         0x00000400ul
 #define PUBLIC_MECH_SSL_FLAG         0x00000800ul
 #define PUBLIC_MECH_TLS_FLAG         0x00001000ul
 #define PUBLIC_MECH_AES_FLAG         0x00002000ul
 #define PUBLIC_MECH_SHA256_FLAG      0x00004000ul
 #define PUBLIC_MECH_SHA512_FLAG      0x00008000ul
 #define PUBLIC_MECH_CAMELLIA_FLAG    0x00010000ul
 #define PUBLIC_MECH_SEED_FLAG        0x00020000ul
+#define PUBLIC_MECH_ECC_FLAG         0x00040000ul
 
 #define PUBLIC_MECH_RANDOM_FLAG      0x08000000ul
 #define PUBLIC_MECH_FRIENDLY_FLAG    0x10000000ul
 #define PUBLIC_OWN_PW_DEFAULTS       0X20000000ul
 #define PUBLIC_DISABLE_FLAG          0x40000000ul
 
 /* warning: reserved means reserved */
 #define PUBLIC_MECH_RESERVED_FLAGS   0x87FF0000ul
 
 /* These cipher flags are visible to all other libraries, */
@@ skipping 90 matching lines @@
 /* of modType has been installed */
 PRBool SECMOD_IsModulePresent( unsigned long int pubCipherEnableFlags );
 
 /* accessors */
 PRBool SECMOD_GetSkipFirstFlag(SECMODModule *mod);
 PRBool SECMOD_GetDefaultModDBFlag(SECMODModule *mod);
 
 /* Functions used to convert between internal & public representation
  * of Mechanism Flags and Cipher Enable Flags */
 extern unsigned long SECMOD_PubMechFlagstoInternal(unsigned long publicFlags);
+extern unsigned long SECMOD_InternaltoPubMechFlags(unsigned long internalFlags);
 extern unsigned long SECMOD_PubCipherFlagstoInternal(unsigned long publicFlags);
 
 PRBool SECMOD_HasRemovableSlots(SECMODModule *mod);
 PK11SlotInfo *SECMOD_WaitForAnyTokenEvent(SECMODModule *mod, 
                                 unsigned long flags, PRIntervalTime latency);
 /*
  * Warning: the SECMOD_CancelWait function is highly destructive, potentially 
  * finalizing  the module 'mod' (causing inprogress operations to fail, 
  * and session key material to disappear). It should only be called when 
  * shutting down  the module. 
  */
 SECStatus SECMOD_CancelWait(SECMODModule *mod);
 /*
  * check to see if the module has added new slots. PKCS 11 v2.20 allows for
  * modules to add new slots, but never remove them. Slots not be added between 
  * a call to C_GetSlotLlist(Flag, NULL, &count) and the corresponding
  * C_GetSlotList(flag, &data, &count) so that the array doesn't accidently
  * grow on the caller. It is permissible for the slots to increase between
  * corresponding calls with NULL to get the size.
  */
 SECStatus SECMOD_UpdateSlotList(SECMODModule *mod);
 SEC_END_PROTOS
 
 #endif