NSS: update to 3.12.6 RC0

mozilla/security/nss/lib/cryptohi/cryptohi.h

 /*
  * crypto.h - public data structures and prototypes for the crypto library
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 19 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: cryptohi.h,v 1.13 2009/09/23 22:51:56 wtc%google.com Exp $ */
+/* $Id: cryptohi.h,v 1.14 2010/02/10 00:49:43 wtc%google.com Exp $ */
 
 #ifndef _CRYPTOHI_H_
 #define _CRYPTOHI_H_
 
 #include "blapit.h"
 
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "cryptoht.h"
@@ skipping 79 matching lines @@
 /*
 ** Sign a single block of data using private key encryption and given
 ** signature/hash algorithm.
 **      "result" the final signature data (memory is allocated)
 **      "buf" the input data to sign
 **      "len" the amount of data to sign
 **      "pk" the private key to encrypt with
 **      "algid" the signature/hash algorithm to sign with 
 **              (must be compatible with the key type).
 */
-extern SECStatus SEC_SignData(SECItem *result, unsigned char *buf, int len,
+extern SECStatus SEC_SignData(SECItem *result,
+                             const unsigned char *buf, int len,
                              SECKEYPrivateKey *pk, SECOidTag algid);
 
 /*
 ** Sign a pre-digested block of data using private key encryption, encoding
 **  The given signature/hash algorithm.
 **      "result" the final signature data (memory is allocated)
 **      "digest" the digest to sign
 **      "pk" the private key to encrypt with
 **      "algtag" The algorithm tag to encode (need for RSA only)
 */
@@ skipping 190 matching lines @@
 **   This function is deprecated. Use VFY_VerifyDataDirect or 
 **   VFY_VerifyDataWithAlgorithmID instead.
 **      "buf" the input data
 **      "len" the length of the input data
 **      "key" the public key to check the signature with
 **      "sig" the encrypted signature data
 **      "sigAlg" specifies the signing algorithm to use.  This must match
 **          the key type.
 **      "wincx" void pointer to the window context
 */
-extern SECStatus VFY_VerifyData(unsigned char *buf, int len,
-                                SECKEYPublicKey *key, SECItem *sig,
+extern SECStatus VFY_VerifyData(const unsigned char *buf, int len,
+                                const SECKEYPublicKey *key, const SECItem *sig,
                                 SECOidTag sigAlg, void *wincx);
 /*
 ** Verify the signature on a block of data. The signature data is an RSA
 ** private key encrypted block of data formatted according to PKCS#1.
 **      "buf" the input data
 **      "len" the length of the input data
 **      "key" the public key to check the signature with
 **      "sig" the encrypted signature data
 **      "pubkAlg" specifies the cryptographic signing algorithm to use (the
 **         raw algorithm without any hash specified.  This must match the key 
@@ skipping 21 matching lines @@
 **      "key" the public key to check the signature with
 **      "sig" the encrypted signature data
 **      "algid" specifies the signing algorithm and parameters to use.
 **         This must match the key type.
 **      "hash" optional pointer to return the oid of the actual hash used in 
 **         the signature. If this value is NULL no, hash oid is returned.
 **      "wincx" void pointer to the window context
 */
 extern SECStatus VFY_VerifyDataWithAlgorithmID(const unsigned char *buf, 
                                 int len, const SECKEYPublicKey *key,
-                                 const SECItem *sig,
+                                const SECItem *sig,
                                 const SECAlgorithmID *algid, SECOidTag *hash,
                                 void *wincx);
 
 
 SEC_END_PROTOS
 
 #endif /* _CRYPTOHI_H_ */