Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix last change in gnutls.c

Browse source 
* src/gnutls.c (Fgnutls_boot): Pacify
--enable-check-lisp-object-type and Haiku GCC warning involving
`key_file2_aux'.
This commit is contained in:
Po Lu 2022-12-31 09:10:23 +08:00
parent 9d0f5909af
commit e645bcc26d
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gnutls.c
View file

@ -1792,9 +1792,8 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object proplist)
The key :flags receives a list of symbols, each of which
corresponds to a GnuTLS C flag, the ORed result is to be passed to
the function gnutls_certificate_set_x509_key_file2() as its last
argument.
*/
the function `gnutls_certificate_set_x509_key_file2' as its last
argument. */
static unsigned int
key_file2_aux (Lisp_Object flags)
{
@ -1940,6 +1939,9 @@ one trustfile (usually a CA bundle). */)
Lisp_Object loglevel;
Lisp_Object hostname;
Lisp_Object prime_bits;
#ifdef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2
unsigned int aux_key_file;
#endiif
struct Lisp_Process *p = XPROCESS (proc);
CHECK_PROCESS (proc);
@ -2134,10 +2136,17 @@ one trustfile (usually a CA bundle). */)
certfile = ansi_encode_filename (certfile);
# endif
# ifdef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2
if (plist_member (proplist, QCpass))
ret = gnutls_certificate_set_x509_key_file2
(x509_cred, SSDATA (certfile), SSDATA (keyfile), file_format,
c_pass, key_file2_aux (flags));
if (!NILP (plist_member (proplist, QCpass)))
{
aux_key_file = key_file2_aux (flags);
ret
= gnutls_certificate_set_x509_key_file2 (x509_cred,
SSDATA (certfile),
SSDATA (keyfile),
file_format,
c_pass,
aux_key_file);
}
else
# endif
ret = gnutls_certificate_set_x509_key_file