diff options
Diffstat (limited to 'lib/freebl/shvfy.c')
| -rw-r--r-- | lib/freebl/shvfy.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/lib/freebl/shvfy.c b/lib/freebl/shvfy.c index 5ff08b158..ad64a26a2 100644 --- a/lib/freebl/shvfy.c +++ b/lib/freebl/shvfy.c @@ -16,7 +16,6 @@ #include "prmem.h" #include "hasht.h" #include "pqg.h" -#include "blapii.h" /* * Most modern version of Linux support a speed optimization scheme where an @@ -274,10 +273,8 @@ readItem(PRFileDesc *fd, SECItem *item) return SECSuccess; } -static PRBool blapi_SHVerifyFile(const char *shName, PRBool self); - -static PRBool -blapi_SHVerify(const char *name, PRFuncPtr addr, PRBool self) +PRBool +BLAPI_SHVerify(const char *name, PRFuncPtr addr) { PRBool result = PR_FALSE; /* if anything goes wrong, * the signature does not verify */ @@ -286,7 +283,7 @@ blapi_SHVerify(const char *name, PRFuncPtr addr, PRBool self) if (!shName) { goto loser; } - result = blapi_SHVerifyFile(shName, self); + result = BLAPI_SHVerifyFile(shName); loser: if (shName != NULL) { @@ -297,20 +294,8 @@ loser: } PRBool -BLAPI_SHVerify(const char *name, PRFuncPtr addr) -{ - return blapi_SHVerify(name, addr, PR_FALSE); -} - -PRBool BLAPI_SHVerifyFile(const char *shName) { - return blapi_SHVerifyFile(shName, PR_FALSE); -} - -static PRBool -blapi_SHVerifyFile(const char *shName, PRBool self) -{ char *checkName = NULL; PRFileDesc *checkFD = NULL; PRFileDesc *shFD = NULL; @@ -335,12 +320,6 @@ blapi_SHVerifyFile(const char *shName, PRBool self) hash.data = hashBuf; hash.len = sizeof(hashBuf); - /* If our integrity check was never ran or failed, fail any other - * integrity checks to prevent any token going into FIPS mode. */ - if (!self && (BL_FIPSEntryOK(PR_FALSE) != SECSuccess)) { - return PR_FALSE; - } - if (!shName) { goto loser; } @@ -525,5 +504,5 @@ BLAPI_VerifySelf(const char *name) */ return PR_TRUE; } - return blapi_SHVerify(name, (PRFuncPtr) decodeInt, PR_TRUE); + return BLAPI_SHVerify(name, (PRFuncPtr) decodeInt); } |