EVP & TLS: Add necessary EC_KEY data extraction functions, and use them

[openssl.git] / include / internal / o_dir.h

diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h
index 0ab4b1c690b336c0144c8b4fa129903644965dad..220cf173e65319b495b7b788b41e88a46cfae403 100644 (file)
--- a/include/internal/o_dir.h
+++ b/include/internal/o_dir.h
@@ -1,14 +1,14 @@
 /*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-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
  */
 
 /*
- * This file is dual-licensed and is also avialable under the following
+ * This file is dual-licensed and is also available under the following
  * terms:
  *
  * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
@@ -36,25 +36,17 @@
  * SUCH DAMAGE.
  */
 
-#ifndef O_DIR_H
-# define O_DIR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef OSSL_INTERNAL_O_DIR_H
+# define OSSL_INTERNAL_O_DIR_H
 
 typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
 
-  /*
-   * returns NULL on error or end-of-directory. If it is end-of-directory,
-   * errno will be zero
-   */
+/*
+ * returns NULL on error or end-of-directory. If it is end-of-directory,
+ * errno will be zero
+ */
 const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory);
-  /* returns 1 on success, 0 on error */
+/* returns 1 on success, 0 on error */
 int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif                          /* LPDIR_H */