File eID-fix-openssl.patch of Package eID-belgium.2992

Overview Repositories Revisions Requests Users Attributes Meta

File eID-fix-openssl.patch of Package eID-belgium.2992

Index: beid-2.6.0/src/eidlib/Verify.cpp
===================================================================
--- beid-2.6.0.orig/src/eidlib/Verify.cpp
+++ beid-2.6.0/src/eidlib/Verify.cpp
@@ -186,7 +186,7 @@ void CVerify::CleanupX509store(spc_x509s
      }
   }
   sk_X509_free(spc_store->certs);
-  for (i = 0; i < sk_X509_num(spc_store->crls); i++)
+  for (i = 0; i < sk_X509_CRL_num(spc_store->crls); i++)
   {
      X509_CRL *pX509CRL = sk_X509_CRL_value(spc_store->crls, i);
      if (pX509CRL != NULL)
@@ -195,7 +195,7 @@ void CVerify::CleanupX509store(spc_x509s
          pX509CRL = NULL;
      }
   }
-  sk_X509_free(spc_store->crls);
+  sk_X509_CRL_free(spc_store->crls);
   sk_X509_free(spc_store->use_certs);
 }
 
@@ -221,7 +221,7 @@ void CVerify::X509StoreAddCRL(spc_x509st
 {
     // Check CRL already in store
     bool bFound = false;
-    for (int i = 0; i < sk_X509_num(spc_store->crls); i++)
+    for (int i = 0; i < sk_X509_CRL_num(spc_store->crls); i++)
     {
         X509_CRL *pX509CRL = sk_X509_CRL_value(spc_store->crls, i);
         if (X509_V_OK == X509_CRL_cmp(pX509CRL, crl))
@@ -408,11 +408,13 @@ char *CVerify::GetExtensionValue(X509 *p
 
     if(pStack != NULL)
     {
+	STACK_OF(DIST_POINT)  *pdist = (STACK_OF(DIST_POINT)*)pStack;
+
         if(iNID == NID_crl_distribution_points)
         {
-            for(j = 0; j < sk_DIST_POINT_num(pStack) && !bFound; j++) 
+            for(j = 0; j < sk_DIST_POINT_num(pdist) && !bFound; j++) 
             {
-                DIST_POINT *pRes = (DIST_POINT *)sk_DIST_POINT_value(pStack, j);
+                DIST_POINT *pRes = (DIST_POINT *)sk_DIST_POINT_value(pdist, j);
                 if(pRes != NULL)
                 {
                     STACK_OF(GENERAL_NAME) *pNames = pRes->distpoint->name.fullname;
@@ -431,13 +433,14 @@ char *CVerify::GetExtensionValue(X509 *p
                     }
                 }
             } 
-            sk_DIST_POINT_free(pStack);
+            sk_DIST_POINT_free(pdist);
         }
         else if(iNID == NID_info_access)
         {
-            for(j = 0; j < sk_ACCESS_DESCRIPTION_num(pStack) && !bFound; j++) 
+	    STACK_OF(ACCESS_DESCRIPTION)  *paccess = (STACK_OF(ACCESS_DESCRIPTION)*)pStack;
+            for(j = 0; j < sk_ACCESS_DESCRIPTION_num(paccess) && !bFound; j++) 
             {
-                ACCESS_DESCRIPTION *pAccess = sk_ACCESS_DESCRIPTION_value(pStack, j);
+                ACCESS_DESCRIPTION *pAccess = sk_ACCESS_DESCRIPTION_value(paccess, j);
                 if(pAccess != NULL && pAccess->method != NULL && OBJ_obj2nid(pAccess->method) == NID_ad_OCSP)
                 {
                     GENERAL_NAME *pName = pAccess->location;
@@ -448,7 +451,7 @@ char *CVerify::GetExtensionValue(X509 *p
                     }
                 }
             }
-            sk_ACCESS_DESCRIPTION_free(pStack);
+            sk_ACCESS_DESCRIPTION_free(paccess);
         }
     }
 
@@ -461,10 +464,10 @@ char *CVerify::GetExtensionValue(X509 *p
 
 int CVerify::VerifyCertHostname(X509 *pCert, char *pszHostname)
 {
-    struct stack_st *pStack = NULL;
+    STACK_OF(GENERAL_NAME) *pStack = NULL;
     BOOL bFound = FALSE;
 
-    pStack = (struct stack_st *) X509_get_ext_d2i(pCert, NID_subject_alt_name, NULL, NULL);
+    pStack = (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(pCert, NID_subject_alt_name, NULL, NULL);
     if(pStack != NULL)
     {
         int i, iLen1, iLen2;
@@ -1540,7 +1543,7 @@ int CVerify::VerifyOID(X509 *pCert)
     POLICYINFO *pinfo = NULL;
     BOOL bFound = FALSE;
 
-    pol = (struct stack_st *) X509_get_ext_d2i(pCert, NID_certificate_policies, NULL, NULL);
+    pol = (STACK_OF(POLICYINFO) *) X509_get_ext_d2i(pCert, NID_certificate_policies, NULL, NULL);
 
     if(pol != NULL)
     {

Places

File eID-fix-openssl.patch of Package eID-belgium.2992

Places