| conf_sap.c (109998) | conf_sap.c (111147) |
|---|---|
| 1/* conf_sap.c */ 2/* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL 3 * project 2001. 4 */ 5/* ==================================================================== 6 * Copyright (c) 2001 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 49 unchanged lines hidden (view full) --- 58 59#include <stdio.h> 60#include <openssl/crypto.h> 61#include "cryptlib.h" 62#include <openssl/conf.h> 63#include <openssl/dso.h> 64#include <openssl/x509.h> 65#include <openssl/asn1.h> | 1/* conf_sap.c */ 2/* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL 3 * project 2001. 4 */ 5/* ==================================================================== 6 * Copyright (c) 2001 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 49 unchanged lines hidden (view full) --- 58 59#include <stdio.h> 60#include <openssl/crypto.h> 61#include "cryptlib.h" 62#include <openssl/conf.h> 63#include <openssl/dso.h> 64#include <openssl/x509.h> 65#include <openssl/asn1.h> |
| 66#ifndef OPENSSL_NO_ENGINE |
|
| 66#include <openssl/engine.h> | 67#include <openssl/engine.h> |
| 68#endif |
|
| 67 68/* This is the automatic configuration loader: it is called automatically by 69 * OpenSSL when any of a number of standard initialisation functions are called, 70 * unless this is overridden by calling OPENSSL_no_config() 71 */ 72 73static int openssl_configured = 0; 74 75void OPENSSL_config(const char *config_name) 76 { 77 if (openssl_configured) 78 return; 79 80 OPENSSL_load_builtin_modules(); | 69 70/* This is the automatic configuration loader: it is called automatically by 71 * OpenSSL when any of a number of standard initialisation functions are called, 72 * unless this is overridden by calling OPENSSL_no_config() 73 */ 74 75static int openssl_configured = 0; 76 77void OPENSSL_config(const char *config_name) 78 { 79 if (openssl_configured) 80 return; 81 82 OPENSSL_load_builtin_modules(); |
| 83#ifndef OPENSSL_NO_ENGINE |
|
| 81 /* Need to load ENGINEs */ 82 ENGINE_load_builtin_engines(); | 84 /* Need to load ENGINEs */ 85 ENGINE_load_builtin_engines(); |
| 86#endif |
|
| 83 /* Add others here? */ 84 85 86 ERR_clear_error(); 87 if (CONF_modules_load_file(NULL, NULL, 88 CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) 89 { 90 BIO *bio_err; --- 17 unchanged lines hidden --- | 87 /* Add others here? */ 88 89 90 ERR_clear_error(); 91 if (CONF_modules_load_file(NULL, NULL, 92 CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) 93 { 94 BIO *bio_err; --- 17 unchanged lines hidden --- |