Reorganize local header files

[thirdparty/openssl.git] / crypto / store / store_init.c

diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c
index 90d5436634220df8b0fd73059d6a9104a5a5b2de..e1b953fbf8c79949ec0afb8706a591a2d5dd2c97 100644 (file)
--- a/crypto/store/store_init.c
+++ b/crypto/store/store_init.c
@@ -1,23 +1,24 @@
 /*
- * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
 
 #include <openssl/err.h>
-#include "internal/store.h"
-#include "store_locl.h"
+#include "crypto/store.h"
+#include "store_local.h"
 
 static CRYPTO_ONCE store_init = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(do_store_init)
 {
-    return OPENSSL_init_crypto(0, NULL);
+    return OPENSSL_init_crypto(0, NULL)
+        && ossl_store_file_loader_init();
 }
 
-int ossl_store_init_once()
+int ossl_store_init_once(void)
 {
     if (!RUN_ONCE(&store_init, do_store_init)) {
         OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_INIT_ONCE, ERR_R_MALLOC_FAILURE);