diff options
author | Rich Salz <rsalz@akamai.com> | 2015-12-16 16:12:24 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-12-16 16:14:49 -0500 |
commit | 7644a9aef8932ed4d1c3f25ed776c997702982be (patch) | |
tree | d8f1e7fca20ad12683a1e2e52c92b6999ada23a6 /ssl/packet_locl.h | |
parent | e4cf866322a4549c55153f9f135f9dadf4d3fc31 (diff) | |
download | openssl-new-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.gz |
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 <tjh@openssl.org>
Diffstat (limited to 'ssl/packet_locl.h')
-rw-r--r-- | ssl/packet_locl.h | 5 |
1 files changed, 2 insertions, 3 deletions
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); } |