From 7644a9aef8932ed4d1c3f25ed776c997702982be Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 16 Dec 2015 16:12:24 -0500 Subject: Rename some BUF_xxx to OPENSSL_xxx Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen} to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen} Add #define's for the old names. Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros. Reviewed-by: Tim Hudson --- ssl/packet_locl.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ssl/packet_locl.h') diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h index cb61a93ad3..c0ab8257b7 100644 --- a/ssl/packet_locl.h +++ b/ssl/packet_locl.h @@ -408,8 +408,7 @@ __owur static inline int PACKET_memdup(const PACKET *pkt, unsigned char **data, if (length == 0) return 1; - *data = BUF_memdup(pkt->curr, length); - + *data = OPENSSL_memdup(pkt->curr, length); if (*data == NULL) return 0; @@ -432,7 +431,7 @@ __owur static inline int PACKET_strndup(const PACKET *pkt, char **data) OPENSSL_free(*data); /* This will succeed on an empty packet, unless pkt->curr == NULL. */ - *data = BUF_strndup((const char*)pkt->curr, PACKET_remaining(pkt)); + *data = OPENSSL_strndup((const char*)pkt->curr, PACKET_remaining(pkt)); return (*data != NULL); } -- cgit v1.2.3