oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hx509: Flags are unsigned

Browse Source
This commit is contained in:
Nicolas Williams
2021-12-17 13:20:00 -06:00
committed by Luke Howard
parent 686d5116de
commit e84bcc29d3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/hx509/cert.c
View File

@@ -971,7 +971,7 @@ check_key_usage(hx509_context context, const Certificate *cert,
size_t size; size_t size;
int ret; int ret;
size_t i = 0; size_t i = 0;
unsigned ku_flags; uint64_t ku_flags;
if (_hx509_cert_get_version(cert) < 3) if (_hx509_cert_get_version(cert) < 3)
return 0; return 0;
@@ -992,14 +992,16 @@ check_key_usage(hx509_context context, const Certificate *cert,
return ret; return ret;
ku_flags = KeyUsage2int(ku); ku_flags = KeyUsage2int(ku);
if ((ku_flags & flags) != flags) { if ((ku_flags & flags) != flags) {
unsigned missing = (~ku_flags) & flags; uint64_t missing = (~ku_flags) & flags;
char buf[256], *name; char buf[256], *name;
unparse_flags(missing, asn1_KeyUsage_units(), buf, sizeof(buf)); int result = unparse_flags(missing, asn1_KeyUsage_units(),
buf, sizeof(buf));
_hx509_unparse_Name(&cert->tbsCertificate.subject, &name); _hx509_unparse_Name(&cert->tbsCertificate.subject, &name);
hx509_set_error_string(context, 0, HX509_KU_CERT_MISSING, hx509_set_error_string(context, 0, HX509_KU_CERT_MISSING,
"Key usage %s required but missing " "Key usage %s required but missing "
"from certificate %s", buf, "from certificate %s",
(result > 0) ? buf : "<unknown>",
name ? name : "<unknown>"); name ? name : "<unknown>");
free(name); free(name);
return HX509_KU_CERT_MISSING; return HX509_KU_CERT_MISSING;

2
lib/hx509/ks_p11.c
View File

@@ -38,7 +38,7 @@
#include "ref/pkcs11.h" #include "ref/pkcs11.h"
struct p11_slot { struct p11_slot {
int flags; uint64_t flags;
#define P11_SESSION 1 #define P11_SESSION 1
#define P11_SESSION_IN_USE 2 #define P11_SESSION_IN_USE 2
#define P11_LOGIN_REQ 4 #define P11_LOGIN_REQ 4