sslapitest.c: With fips skip tests depending on X25519 and X448

[openssl.git] / crypto / dh / dh_depr.c

diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index f0903ca20ace488c3ae13c8e0194f1ab44de4d78..5822d511d958acdec63842a33071ff9e134c0b93 100644 (file)
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.

  *
  * 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
  *
  * 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


@@ -9,15 +9,18 @@
 
 /* This file contains deprecated functions as wrappers to the new ones */
 
 
 /* This file contains deprecated functions as wrappers to the new ones */
 

+/*
+ * DH low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+

 #include <openssl/opensslconf.h>
 #include <openssl/opensslconf.h>

-#if OPENSSL_API_0_9_8
-NON_EMPTY_TRANSLATION_UNIT
-#else

 
 

-# include <stdio.h>
-# include "internal/cryptlib.h"
-# include <openssl/bn.h>
-# include <openssl/dh.h>
+#include <stdio.h>
+#include "internal/cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>

 
 DH *DH_generate_parameters(int prime_len, int generator,
                            void (*callback) (int, int, void *), void *cb_arg)
 
 DH *DH_generate_parameters(int prime_len, int generator,
                            void (*callback) (int, int, void *), void *cb_arg)


@@ -43,4 +46,3 @@ DH *DH_generate_parameters(int prime_len, int generator,
     DH_free(ret);
     return NULL;
 }
     DH_free(ret);
     return NULL;
 }

-#endif