security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Add special treatment for the standard hkps pool to ntbtls. 

* dirmngr/validate.h (VALIDATE_FLAG_SYSTRUST): Remove
(VALIDATE_FLAG_EXTRATRUST): Remove
(VALIDATE_FLAG_TRUST_SYSTEM): New.
(VALIDATE_FLAG_TRUST_CONFIG): New.
(VALIDATE_FLAG_TRUST_HKP): New.
(VALIDATE_FLAG_TRUST_HKPSPOOL): New.
(VALIDATE_FLAG_MASK_TRUST): New.
* dirmngr/validate.c (check_header_constants): New.
(validate_cert_chain): Call new function.  Simplify call to
is_trusted_cert.
* dirmngr/crlcache.c (crl_parse_insert): Pass
VALIDATE_FLAG_TRUST_CONFIG to validate_cert_chain
* dirmngr/server.c (cmd_validate): Use VALDIATE_FLAG_TRUST_SYSTEM and
VALIDATE_FLAG_TRUST_CONFIG.
* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Check provided TLS
context.  Set trustclass flags using the new VALIDATE_FLAG_TRUST
values.

* dirmngr/certcache.c (cert_cache_init): Load the standard pool
certificate prior to the --hkp-cacerts.
--

Note that this changes the way the standard cert is used: We require
that it is installed at /usr/share/gnupg and we do not allow to change
it.  If this is not desired, the the standard cert can be removed or
replaced by a newer one.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-02-21 14:55:04 +01:00
parent d1625a9a82
commit 831d014550
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
7 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dirmngr/certcache.c
View File

@ -709,16 +709,15 @@ cert_cache_init (strlist_t hkp_cacerts)
load_certs_from_dir (fname, 0); load_certs_from_dir (fname, 0);
xfree (fname); xfree (fname);
for (sl = hkp_cacerts; sl; sl = sl->next)
load_certs_from_file (sl->d, CERTTRUST_CLASS_HKP, 0);
fname = make_filename_try (gnupg_datadir (), fname = make_filename_try (gnupg_datadir (),
"sks-keyservers.netCA.pem", NULL); "sks-keyservers.netCA.pem", NULL);
if (fname) if (fname)
load_certs_from_file (fname, CERTTRUST_CLASS_HKPSPOOL, 1); load_certs_from_file (fname, CERTTRUST_CLASS_HKPSPOOL, 1);
xfree (fname); xfree (fname);
for (sl = hkp_cacerts; sl; sl = sl->next)
load_certs_from_file (sl->d, CERTTRUST_CLASS_HKP, 0);
initialization_done = 1; initialization_done = 1;
release_cache_lock (); release_cache_lock ();

3
dirmngr/crlcache.c
View File

@ -1851,7 +1851,8 @@ crl_parse_insert (ctrl_t ctrl, ksba_crl_t crl,
md = NULL; md = NULL;
err = validate_cert_chain (ctrl, crlissuer_cert, NULL, err = validate_cert_chain (ctrl, crlissuer_cert, NULL,
(VALIDATE_FLAG_CRL (VALIDATE_FLAG_TRUST_CONFIG
| VALIDATE_FLAG_CRL
| VALIDATE_FLAG_RECURSIVE), | VALIDATE_FLAG_RECURSIVE),
r_trust_anchor); r_trust_anchor);
if (err) if (err)

25
dirmngr/http-ntbtls.c
View File

@ -41,20 +41,23 @@ gnupg_http_tls_verify_cb (void *opaque,
void *tls_context) void *tls_context)
{ {
ctrl_t ctrl = opaque; ctrl_t ctrl = opaque;
ntbtls_t tls = tls_context;
gpg_error_t err; gpg_error_t err;
int idx; int idx;
ksba_cert_t cert; ksba_cert_t cert;
ksba_cert_t hostcert = NULL; ksba_cert_t hostcert = NULL;
unsigned int validate_flags; unsigned int validate_flags;
const char *hostname;
(void)http; (void)http;
(void)session; (void)session;
log_assert (ctrl && ctrl->magic == SERVER_CONTROL_MAGIC); log_assert (ctrl && ctrl->magic == SERVER_CONTROL_MAGIC);
log_assert (!ntbtls_check_context (tls));
/* Get the peer's certs fron ntbtls. */ /* Get the peer's certs fron ntbtls. */
for (idx = 0; for (idx = 0;
(cert = ntbtls_x509_get_peer_cert (tls_context, idx)); idx++) (cert = ntbtls_x509_get_peer_cert (tls, idx)); idx++)
{ {
if (!idx) if (!idx)
hostcert = cert; hostcert = cert;
@ -73,10 +76,22 @@ gnupg_http_tls_verify_cb (void *opaque,
} }
validate_flags = VALIDATE_FLAG_TLS; validate_flags = VALIDATE_FLAG_TLS;
/* if ((http_flags & HTTP_FLAG_TRUST_DEF)) */
/* validate_flags |= VALIDATE_FLAG_??; */ /* Are we using the standard hkps:// pool use the dedicated
if ((http_flags & HTTP_FLAG_TRUST_SYS)) * root certificate. */
validate_flags |= VALIDATE_FLAG_SYSTRUST; hostname = ntbtls_get_hostname (tls);
if (hostname
&& !ascii_strcasecmp (hostname, "hkps.pool.sks-keyservers.net"))
{
validate_flags |= VALIDATE_FLAG_TRUST_HKPSPOOL;
}
else /* Use the certificates as requested from the HTTP module. */
{
if ((http_flags & HTTP_FLAG_TRUST_DEF))
validate_flags |= VALIDATE_FLAG_TRUST_HKP;
if ((http_flags & HTTP_FLAG_TRUST_SYS))
validate_flags |= VALIDATE_FLAG_TRUST_SYSTEM;
}
if ((http_flags & HTTP_FLAG_NO_CRL)) if ((http_flags & HTTP_FLAG_NO_CRL))
validate_flags |= VALIDATE_FLAG_NOCRLCHECK; validate_flags |= VALIDATE_FLAG_NOCRLCHECK;

2
dirmngr/http.h
View File

@ -86,7 +86,7 @@ enum
HTTP_FLAG_IGNORE_CL = 32, /* Ignore content-length. */ HTTP_FLAG_IGNORE_CL = 32, /* Ignore content-length. */
HTTP_FLAG_IGNORE_IPv4 = 64, /* Do not use IPv4. */ HTTP_FLAG_IGNORE_IPv4 = 64, /* Do not use IPv4. */
HTTP_FLAG_IGNORE_IPv6 = 128, /* Do not use IPv6. */ HTTP_FLAG_IGNORE_IPv6 = 128, /* Do not use IPv6. */
HTTP_FLAG_TRUST_DEF = 256, /* Use the default CAs. */ HTTP_FLAG_TRUST_DEF = 256, /* Use the CAs configured for HKP. */
HTTP_FLAG_TRUST_SYS = 512, /* Also use the system defined CAs. */ HTTP_FLAG_TRUST_SYS = 512, /* Also use the system defined CAs. */
HTTP_FLAG_NO_CRL = 1024 /* Do not consult CRLs for https. */ HTTP_FLAG_NO_CRL = 1024 /* Do not consult CRLs for https. */
}; };

5
dirmngr/server.c
View File

@ -1852,8 +1852,9 @@ cmd_validate (assuan_context_t ctx, char *line)
} }
err = validate_cert_chain (ctrl, cert, NULL, err = validate_cert_chain (ctrl, cert, NULL,
((tls_mode ? VALIDATE_FLAG_TLS : 0) (VALIDATE_FLAG_TRUST_CONFIG
| (systrust_mode ? VALIDATE_FLAG_SYSTRUST : 0) | (tls_mode ? VALIDATE_FLAG_TLS : 0)
| (systrust_mode ? VALIDATE_FLAG_TRUST_SYSTEM : 0)
| (no_crl ? VALIDATE_FLAG_NOCRLCHECK : 0)), | (no_crl ? VALIDATE_FLAG_NOCRLCHECK : 0)),
NULL); NULL);

30
dirmngr/validate.c
View File

@ -74,6 +74,29 @@ static const char oid_kp_ocspSigning[] = "1.3.6.1.5.5.7.3.9";
static gpg_error_t check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert); static gpg_error_t check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert);
/* Make sure that the values defined in the headers are correct. We
* can't use the preprocessor due to the use of enums. */
static void
check_header_constants (void)
{
log_assert (CERTTRUST_CLASS_SYSTEM == VALIDATE_FLAG_TRUST_SYSTEM);
log_assert (CERTTRUST_CLASS_CONFIG == VALIDATE_FLAG_TRUST_CONFIG);
log_assert (CERTTRUST_CLASS_HKP == VALIDATE_FLAG_TRUST_HKP);
log_assert (CERTTRUST_CLASS_HKPSPOOL == VALIDATE_FLAG_TRUST_HKPSPOOL);
#undef X
#define X (VALIDATE_FLAG_TRUST_SYSTEM | VALIDATE_FLAG_TRUST_CONFIG \
| VALIDATE_FLAG_TRUST_HKP | VALIDATE_FLAG_TRUST_HKPSPOOL)
#if ( X & VALIDATE_FLAG_MASK_TRUST ) != X
# error VALIDATE_FLAG_MASK_TRUST is bad
#endif
#if ( ~X & VALIDATE_FLAG_MASK_TRUST )
# error VALIDATE_FLAG_MASK_TRUST is bad
#endif
#undef X
}
/* Check whether CERT contains critical extensions we don't know /* Check whether CERT contains critical extensions we don't know
@ -393,6 +416,7 @@ validate_cert_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
int any_no_policy_match = 0; int any_no_policy_match = 0;
chain_item_t chain; chain_item_t chain;
check_header_constants ();
if (r_exptime) if (r_exptime)
*r_exptime = 0; *r_exptime = 0;
@ -540,10 +564,8 @@ validate_cert_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
if (err) if (err)
goto leave; /* No. */ goto leave; /* No. */
err = is_trusted_cert err = is_trusted_cert (subject_cert,
(subject_cert, (flags & VALIDATE_FLAG_MASK_TRUST));
(CERTTRUST_CLASS_CONFIG
| (flags & VALIDATE_FLAG_SYSTRUST)? CERTTRUST_CLASS_SYSTEM : 0));
if (!err) if (!err)
; /* Yes we trust this cert. */ ; /* Yes we trust this cert. */
else if (gpg_err_code (err) == GPG_ERR_NOT_TRUSTED) else if (gpg_err_code (err) == GPG_ERR_NOT_TRUSTED)

22
dirmngr/validate.h
View File

@ -22,28 +22,30 @@
#define VALIDATE_H #define VALIDATE_H
/* Make use of the system provided root certificates. */ /* Flag values matching the CERTTRUST_CLASS values and a MASK for
#define VALIDATE_FLAG_SYSTRUST 1 * them. check_header_constants() checks their consistency. */
#define VALIDATE_FLAG_TRUST_SYSTEM 1
/* Make use of extra provided root certificates. */ #define VALIDATE_FLAG_TRUST_CONFIG 2
#define VALIDATE_FLAG_EXTRATRUST 2 #define VALIDATE_FLAG_TRUST_HKP 4
#define VALIDATE_FLAG_TRUST_HKPSPOOL 8
#define VALIDATE_FLAG_MASK_TRUST 0x0f
/* Standard CRL issuer certificate validation; i.e. CRLs are not /* Standard CRL issuer certificate validation; i.e. CRLs are not
* considered for CRL issuer certificates. */ * considered for CRL issuer certificates. */
#define VALIDATE_FLAG_CRL 4 #define VALIDATE_FLAG_CRL 64
/* If this flag is set along with VALIDATE_FLAG_CRL a full CRL /* If this flag is set along with VALIDATE_FLAG_CRL a full CRL
* verification is done. */ * verification is done. */
#define VALIDATE_FLAG_RECURSIVE 8 #define VALIDATE_FLAG_RECURSIVE 128
/* Validation mode as used for OCSP. */ /* Validation mode as used for OCSP. */
#define VALIDATE_FLAG_OCSP 16 #define VALIDATE_FLAG_OCSP 256
/* Validation mode as used with TLS. */ /* Validation mode as used with TLS. */
#define VALIDATE_FLAG_TLS 32 #define VALIDATE_FLAG_TLS 512
/* Don't do CRL checks. */ /* Don't do CRL checks. */
#define VALIDATE_FLAG_NOCRLCHECK 64 #define VALIDATE_FLAG_NOCRLCHECK 1024
/* Validate the certificate CHAIN up to the trust anchor. Optionally /* Validate the certificate CHAIN up to the trust anchor. Optionally