diff options
| author | Lars Ingebrigtsen | 2016-02-18 16:25:37 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-18 16:25:37 +1100 |
| commit | e96df838aff3e1432d68cb0ed1fa899f79a70847 (patch) | |
| tree | cf299ae63a0f5bdce4125b78ff58fc10631e6d37 /src/process.c | |
| parent | d4bb0b923b30c78ea18e4744c7a9ab6f3f2c4b1b (diff) | |
| download | emacs-e96df838aff3e1432d68cb0ed1fa899f79a70847.tar.gz emacs-e96df838aff3e1432d68cb0ed1fa899f79a70847.zip | |
Verify the TLS connection asynchronously
* src/gnutls.c (gnutls_verify_boot): Refactor out into its own
function so that we can call it asynchronously.
(Fgnutls_boot): Use it.
* src/process.c (wait_reading_process_output): Verify the TLS
negotiation.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index d78b04f9770..4a11e7f8b8f 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4919,7 +4919,10 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4919 | p->gnutls_handshakes_tried++; | 4919 | p->gnutls_handshakes_tried++; |
| 4920 | 4920 | ||
| 4921 | if (p->gnutls_initstage == GNUTLS_STAGE_READY) | 4921 | if (p->gnutls_initstage == GNUTLS_STAGE_READY) |
| 4922 | finish_after_tls_connection (aproc); | 4922 | { |
| 4923 | gnutls_verify_boot (proc, Qnil); | ||
| 4924 | finish_after_tls_connection (aproc); | ||
| 4925 | } | ||
| 4923 | else if (p->gnutls_handshakes_tried > | 4926 | else if (p->gnutls_handshakes_tried > |
| 4924 | GNUTLS_EMACS_HANDSHAKES_LIMIT) | 4927 | GNUTLS_EMACS_HANDSHAKES_LIMIT) |
| 4925 | { | 4928 | { |