← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/openssl/gutsy-security

« back to all changes in this revision

Viewing changes to crypto/x509/x509_vfy.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2007-03-10 17:11:46 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070310171146-ekahy2avht7qdc4f
Tags: 0.9.8e-4
http://bugs.debian.org/414283
openssl should depend on libssl0.9.8 0.9.8e-1 since it 
uses some of the defines that changed to functions.
Other things build against libssl or libcrypto shouldn't 
have this problem since they use the old headers.
(Closes: #414283)

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/x509/x509_vfy.c
79
79
static int check_cert(X509_STORE_CTX *ctx);
80
80
static int check_policy(X509_STORE_CTX *ctx);
81
81
static int internal_verify(X509_STORE_CTX *ctx);
82
 
const char *X509_version="X.509" OPENSSL_VERSION_PTEXT;
 
82
const char X509_version[]="X.509" OPENSSL_VERSION_PTEXT;
83
83
 
84
84
 
85
85
static int null_callback(int ok, X509_STORE_CTX *e)
312
312
                ok=internal_verify(ctx);
313
313
        if(!ok) goto end;
314
314
 
 
315
#ifndef OPENSSL_NO_RFC3779
 
316
        /* RFC 3779 path validation, now that CRL check has been done */
 
317
        ok = v3_asid_validate_path(ctx);
 
318
        if (!ok) goto end;
 
319
        ok = v3_addr_validate_path(ctx);
 
320
        if (!ok) goto end;
 
321
#endif
 
322
 
315
323
        /* If we get this far evaluate policies */
316
324
        if (!bad_chain && (ctx->param->flags & X509_V_FLAG_POLICY_CHECK))
317
325
                ok = ctx->check_policy(ctx);
1460
1468
void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
1461
1469
        {
1462
1470
        if (ctx->cleanup) ctx->cleanup(ctx);
1463
 
        X509_VERIFY_PARAM_free(ctx->param);
1464
 
        if (ctx->tree)
 
1471
        if (ctx->param != NULL)
 
1472
                {
 
1473
                X509_VERIFY_PARAM_free(ctx->param);
 
1474
                ctx->param=NULL;
 
1475
                }
 
1476
        if (ctx->tree != NULL)
 
1477
                {
1465
1478
                X509_policy_tree_free(ctx->tree);
 
1479
                ctx->tree=NULL;
 
1480
                }
1466
1481
        if (ctx->chain != NULL)
1467
1482
                {
1468
1483
                sk_X509_pop_free(ctx->chain,X509_free);