Bug 402777: FREEBL_VERSION 3.010 should be encoded as 0x030A rather than
authorwtc%google.com
Tue, 13 Nov 2007 03:12:48 +0000
changeset 8218 306698c901cd4681f65c4361943337b4dc0ef7bd
parent 8217 db74cdf2ee50dc053d7ee6ba90f03e30c360869b
child 8219 dcbb6a596aad0b9ee355efd9cd6605227e79a070
push idunknown
push userunknown
push dateunknown
bugs402777
Bug 402777: FREEBL_VERSION 3.010 should be encoded as 0x030A rather than 0x0310. The Camellia functions and the PQG functions should be in the version 3.010 section because they're added after version 3.009. r=nelson.
security/nss/lib/freebl/loader.h
--- a/security/nss/lib/freebl/loader.h
+++ b/security/nss/lib/freebl/loader.h
@@ -39,17 +39,17 @@
  * ***** END LICENSE BLOCK ***** */
 /* $Id$ */
 
 #ifndef _LOADER_H_
 #define _LOADER_H_ 1
 
 #include "blapi.h"
 
-#define FREEBL_VERSION 0x0310
+#define FREEBL_VERSION 0x030A
 
 struct FREEBLVectorStr {
 
   unsigned short length;  /* of this struct in bytes */
   unsigned short version; /* of this struct. */
 
   RSAPrivateKey * (* p_RSA_NewKey)(int         keySizeInBits,
 				 SECItem *   publicExponent);
@@ -453,16 +453,17 @@ struct FREEBLVectorStr {
  SECStatus (* p_FIPS186Change_GenerateX)(unsigned char *XKEY,
                                          const unsigned char *XSEEDj,
                                          unsigned char *x_j);
  SECStatus (* p_FIPS186Change_ReduceModQForDSA)(const unsigned char *w,
                                                 const unsigned char *q,
                                                 unsigned char *xj);
 
   /* Version 3.009 came to here */
+
  SECStatus (* p_Camellia_InitContext)(CamelliaContext *cx,
 				 const unsigned char *key, 
 				 unsigned int keylen, 
 				 const unsigned char *iv, 
 				 int mode, 
 				 unsigned int encrypt,
 				 unsigned int unused);
 
@@ -480,20 +481,21 @@ struct FREEBLVectorStr {
 				  unsigned int inputLen);
 
  SECStatus (* p_Camellia_Decrypt)(CamelliaContext *cx, unsigned char *output,
 				  unsigned int *outputLen,
 				  unsigned int maxOutputLen,
 				  const unsigned char *input,
 				  unsigned int inputLen);
 
-  /* Version 3.010 came to here */
  void (* p_PQG_DestroyParams)(PQGParams *params);
 
  void (* p_PQG_DestroyVerify)(PQGVerify *vfy);
+
+  /* Version 3.010 came to here */
 };
 
 typedef struct FREEBLVectorStr FREEBLVector;
 
 SEC_BEGIN_PROTOS
 
 typedef const FREEBLVector * FREEBLGetVectorFn(void);