d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libsecureboot: avoid recusion in ve_trust_init

Browse Source 
set our guard value immediately.
also replace call to ve_trust_init in opgp_sig.c:initialize with
call to openpgp_trust_init.

Reported by:	mindal@semihalf.com
Reviewed by:	jhibbits obrien
MFC after:	1 week
This commit is contained in:
Simon J. Gerraty 2019-07-11 22:06:59 +00:00
parent 3f3f7c056f
commit 3ae2a848ae
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libsecureboot/openpgp/opgp_sig.c
View File

@ -67,9 +67,7 @@ __FBSDID("$FreeBSD$");
void void
initialize (void) initialize (void)
{ {
#ifdef _STANDALONE openpgp_trust_init();
ve_trust_init();
#endif
} }
#else #else

2
lib/libsecureboot/vets.c
View File

@ -345,7 +345,7 @@ ve_trust_init(void)
if (once >= 0) if (once >= 0)
return (once); return (once);
once = 0; /* to be sure */
ve_utc_set(time(NULL)); ve_utc_set(time(NULL));
#ifdef BUILD_UTC #ifdef BUILD_UTC
ve_utc_set(BUILD_UTC); /* just in case */ ve_utc_set(BUILD_UTC); /* just in case */