Fixup bad checks in previous update

This commit is contained in:
Richard Frith-Macdonald 2022-11-11 09:00:33 +00:00
parent 1f54bdf600
commit d28d019bb5
2 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2022-11-11 Richard Frith-Macdonald <rfm@gnu.org>
* EcCommand.m:
Fix a few incorrect checks for TLS certificate presence.
2022-11-09 Richard Frith-Macdonald <rfm@gnu.org> 2022-11-09 Richard Frith-Macdonald <rfm@gnu.org>
* Control.plist: * Control.plist:

View file

@ -1501,6 +1501,12 @@ valgrindLog(NSString *name)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"invalid ServerOptionsForTLS"]; format: @"invalid ServerOptionsForTLS"];
} }
g = [conf objectForKey: @"OptionsForTLS"];
if (g && NO == [g isKindOfClass: [NSDictionary class]])
{
[NSException raise: NSInvalidArgumentException
format: @"invalid OptionsForTLS"];
}
if (nil == g && nil == c && nil == s) if (nil == g && nil == c && nil == s)
{ {
@ -1549,7 +1555,7 @@ valgrindLog(NSString *name)
GSTLSCertificateKeyFile]; GSTLSCertificateKeyFile];
} }
} }
else else if (s)
{ {
if (nil == [s objectForKey: GSTLSCertificateFile]) if (nil == [s objectForKey: GSTLSCertificateFile])
{ {