]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Fix compile errors.
authorMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 18 May 2016 18:54:04 +0000 (11:54 -0700)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 18 May 2016 18:54:04 +0000 (11:54 -0700)
cups/tls-gnutls.c

index 8c756b75dfe569fd231ba67c1f11a0a40e06ffad..81c6122afeaf11c54b1070c20e75491262a2e8e1 100644 (file)
@@ -397,7 +397,7 @@ httpCredentialsAreValidForName(
         for (i = 0; i < count; i ++)
        {
          rserial_size = sizeof(rserial);
-          if (!gnutls_x509_crl_get_crt_serial(tls_crl, i, rserial, sizeof(rserial)) && cserial_size == rserial_size && !memcmp(cserial, rserial, rserial_size))
+          if (!gnutls_x509_crl_get_crt_serial(tls_crl, i, rserial, &rserial_size, NULL) && cserial_size == rserial_size && !memcmp(cserial, rserial, rserial_size))
          {
            result = 0;
            break;
@@ -919,7 +919,7 @@ http_gnutls_load_crl(void)
           datum.data = data;
          datum.size = num_data;
 
-         gnutls_x509_crl_import(tls_crl, &datum, GNUTLS_X509_FORMAT_PEM);
+         gnutls_x509_crl_import(tls_crl, &datum, GNUTLS_X509_FMT_PEM);
 
          num_data = 0;
        }
@@ -939,11 +939,7 @@ http_gnutls_load_crl(void)
                                            /* Expanded buffer */
 
            if (!tdata)
-           {
-             httpFreeCredentials(*credentials);
-             *credentials = NULL;
              break;
-           }
 
            data       = tdata;
            alloc_data += 1024;