From 6281ff417a97e64be10b423cea3a1bedc164dc08 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Tue, 13 Nov 2007 03:12:48 +0000 Subject: [PATCH] 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. git-svn-id: svn://10.0.0.236/trunk@239254 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/freebl/loader.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/security/nss/lib/freebl/loader.h b/mozilla/security/nss/lib/freebl/loader.h index b23b8fddfe3..95116304c99 100644 --- a/mozilla/security/nss/lib/freebl/loader.h +++ b/mozilla/security/nss/lib/freebl/loader.h @@ -37,14 +37,14 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: loader.h,v 1.20 2007-11-09 18:49:32 wtc%google.com Exp $ */ +/* $Id: loader.h,v 1.21 2007-11-13 03:12:48 wtc%google.com Exp $ */ #ifndef _LOADER_H_ #define _LOADER_H_ 1 #include "blapi.h" -#define FREEBL_VERSION 0x0310 +#define FREEBL_VERSION 0x030A struct FREEBLVectorStr { @@ -458,6 +458,7 @@ struct FREEBLVectorStr { unsigned char *xj); /* Version 3.009 came to here */ + SECStatus (* p_Camellia_InitContext)(CamelliaContext *cx, const unsigned char *key, unsigned int keylen, @@ -485,10 +486,11 @@ struct FREEBLVectorStr { 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;