|
@@ -30,16 +30,14 @@ extern "C" {
|
|
|
# include <stddef.h>
|
|
|
# include <sys/types.h>
|
|
|
|
|
|
-/*
|
|
|
- * These names are outdated as of OpenSSL 1.1; a future release
|
|
|
- * will move them to be deprecated.
|
|
|
- */
|
|
|
-# define BUF_strdup(s) OPENSSL_strdup(s)
|
|
|
-# define BUF_strndup(s, size) OPENSSL_strndup(s, size)
|
|
|
-# define BUF_memdup(data, size) OPENSSL_memdup(data, size)
|
|
|
-# define BUF_strlcpy(dst, src, size) OPENSSL_strlcpy(dst, src, size)
|
|
|
-# define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
|
|
|
-# define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
|
|
|
+# if !OPENSSL_API_3
|
|
|
+# define BUF_strdup(s) OPENSSL_strdup(s)
|
|
|
+# define BUF_strndup(s, size) OPENSSL_strndup(s, size)
|
|
|
+# define BUF_memdup(data, size) OPENSSL_memdup(data, size)
|
|
|
+# define BUF_strlcpy(dst, src, size) OPENSSL_strlcpy(dst, src, size)
|
|
|
+# define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
|
|
|
+# define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
|
|
|
+# endif
|
|
|
|
|
|
struct buf_mem_st {
|
|
|
size_t length; /* current number of bytes */
|