Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT.

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

 /*
  * crypto.h - public data structures and prototypes for the crypto library
  *
  * 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/. */
 /* $Id: cryptohi.h,v 1.17 2012/06/25 21:48:39 rrelyea%redhat.com Exp $ */
 
 #ifndef _CRYPTOHI_H_
 #define _CRYPTOHI_H_
 
 #include "blapit.h"
 
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "cryptoht.h"
 #include "keyt.h"
 #include "certt.h"
 
 
 SEC_BEGIN_PROTOS
 
 
 /****************************************/
 /*
 ** DER encode/decode (EC)DSA signatures
 */
 
-/* ANSI X9.57 defines DSA signatures as DER encoded data.  Our DSA code (and
+/* ANSI X9.57 defines DSA signatures as DER encoded data.  Our DSA1 code (and
  * most of the rest of the world) just generates 40 bytes of raw data.  These
  * functions convert between formats.
  */
 extern SECStatus DSAU_EncodeDerSig(SECItem *dest, SECItem *src);
 extern SECItem *DSAU_DecodeDerSig(const SECItem *item);
 
 /*
- * Unlike DSA, raw ECDSA signatures do not have a fixed length.
+ * Unlike DSA1, raw DSA2 and ECDSA signatures do not have a fixed length.
  * Rather they contain two integers r and s whose length depends
- * on the size of the EC key used for signing.
+ * on the size of q or the EC key used for signing.
  *
  * We can reuse the DSAU_EncodeDerSig interface to DER encode
  * raw ECDSA signature keeping in mind that the length of r 
  * is the same as that of s and exactly half of src->len.
  *
  * For decoding, we need to pass the length of the desired
  * raw signature (twice the key size) explicitly.
  */
 extern SECStatus DSAU_EncodeDerSigWithLen(SECItem *dest, SECItem *src, 
                                           unsigned int len);
@@ skipping 309 matching lines @@
 extern SECStatus VFY_VerifyDataWithAlgorithmID(const unsigned char *buf, 
                                 int len, const SECKEYPublicKey *key,
                                 const SECItem *sig,
                                 const SECAlgorithmID *algid, SECOidTag *hash,
                                 void *wincx);
 
 
 SEC_END_PROTOS
 
 #endif /* _CRYPTOHI_H_ */