d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with GCC.

Browse Source 
BIO_new_mem_buf takes a void* buf, but internally it never modifies the
buf. It assigns the buffer to another pointer and then marks it as
read-only. So deconsting it should be safe here.

Also fix warning about 'buf' possibly being unused in parse_cert()

Approved by:	bapt
MFC after:	2 days
X-MFC-With:	r257147
This commit is contained in:
Bryan Drewery 2013-10-26 19:59:42 +00:00
parent b5c192462c
commit c2788c07bf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=257193
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/pkg/pkg.c
View File

@ -487,7 +487,7 @@ load_public_key_buf(const unsigned char *cert, int certlen)
BIO *bp;
char errbuf[1024];
bp = BIO_new_mem_buf((void *)cert, certlen);
bp = BIO_new_mem_buf(__DECONST(void *, cert), certlen);
if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL)
warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
@ -573,6 +573,7 @@ parse_cert(int fd) {
size_t linecap;
ssize_t linelen;
buf = NULL;
my_fd = -1;
sc = NULL;
line = NULL;