← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to ssl/ssl_lib.c

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Martin
  • Date: 2004-12-16 18:41:29 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20041216184129-z7xjkul57mh1jiha
Tags: upstream-0.9.7e
Import upstream version 0.9.7e

Show diffs side-by-side

added added

removed removed

Lines of Context:
ssl/ssl_lib.c
121
121
#include <openssl/objects.h>
122
122
#include <openssl/lhash.h>
123
123
#include <openssl/x509v3.h>
 
124
#include <openssl/fips.h>
124
125
 
125
126
const char *SSL_version_str=OPENSSL_VERSION_TEXT;
126
127
 
2156
2157
int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
2157
2158
                const char *CApath)
2158
2159
        {
2159
 
        return(X509_STORE_load_locations(ctx->cert_store,CAfile,CApath));
 
2160
        int r;
 
2161
 
 
2162
#ifdef OPENSSL_FIPS
 
2163
        if(ctx->method->version == TLS1_VERSION)
 
2164
            FIPS_allow_md5(1);
 
2165
#endif
 
2166
        r=X509_STORE_load_locations(ctx->cert_store,CAfile,CApath);
 
2167
#ifdef OPENSSL_FIPS
 
2168
        if(ctx->method->version == TLS1_VERSION)
 
2169
            FIPS_allow_md5(0);
 
2170
#endif
 
2171
        return r;
2160
2172
        }
2161
2173
#endif
2162
2174