svn rev #24312: trunk/src/plugins/preauth/pkinit/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24312
Commit By: ghudson
Log Message:
ticket: 6776

Use correct CRL stack macros in pkinit OpenSSL code.  Patch from Olaf
Flebbe.



Changed Files:
U   trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
Modified: trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
===================================================================
--- trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2010-09-15 16:51:31 UTC (rev 24311)
+++ trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2010-09-15 17:06:43 UTC (rev 24312)
@@ -1230,7 +1230,7 @@
         revoked = sk_X509_CRL_new_null();
         for (i = 0; i < size; i++)
             sk_X509_CRL_push(revoked, sk_X509_CRL_value(idctx->revoked, i));
-        size = sk_X509_num(p7->d.sign->crl);
+        size = sk_X509_CRL_num(p7->d.sign->crl);
         for (i = 0; i < size; i++)
             sk_X509_CRL_push(revoked, sk_X509_CRL_value(p7->d.sign->crl, i));
     }
@@ -4915,7 +4915,7 @@
                     continue;
             }
             if (flag != 0) {
-                sk_X509_push(ca_crls, X509_CRL_dup(xi->crl));
+                sk_X509_CRL_push(ca_crls, X509_CRL_dup(xi->crl));
             }
         }
     }
@@ -4945,7 +4945,7 @@
         }
         break;
     case CATYPE_CRLS:
-        if (sk_X509_num(ca_crls) == 0) {
+        if (sk_X509_CRL_num(ca_crls) == 0) {
             pkiDebug("no crls in file, %s\n", filename);
             if (id_cryptoctx->revoked == NULL)
                 sk_X509_CRL_free(ca_crls);