diff options
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/bhyve/Makefile | 19 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/rfb.c | 7 |
2 files changed, 15 insertions, 11 deletions
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index 2257487c0d..3e02ce4a62 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -11,7 +11,7 @@ # # Copyright 2014 Pluribus Networks Inc. -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # PROG = bhyve @@ -115,9 +115,6 @@ CPPFLAGS = -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \ -I$(SRC)/lib/libdladm/common \ -DWITHOUT_CAPSICUM -# Disable the crypto code until it is wired up -CPPFLAGS += -DNO_OPENSSL - pci_nvme.o := CERRWARN += -_gcc=-Wno-pointer-sign SMOFF += all_func_returns,leaks,no_if_block @@ -125,9 +122,17 @@ SMOFF += all_func_returns,leaks,no_if_block # Force c99 for everything CSTD= $(CSTD_GNU99) C99MODE= -xc99=%all -C99LMODE= -Xc99=%all -$(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz +$(PROG) := LDLIBS += \ + -lsocket \ + -lnsl \ + -ldlpi \ + -ldladm \ + -lmd \ + -lsunw_crypto \ + -luuid \ + -lvmmapi \ + -lz $(ZHYVE_PROG) := LDLIBS += -lnvpair $(MEVENT_TEST_PROG) := LDLIBS += -lsocket @@ -150,8 +155,6 @@ clean: $(SUBDIRS) clobber: clean $(SUBDIRS) $(RM) $(CLOBBERFILES) -lint: lint_SRCS $(SUBDIRS) - $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/bhyve/rfb.c b/usr/src/cmd/bhyve/rfb.c index 39ea1611f9..f9cc9ed9c3 100644 --- a/usr/src/cmd/bhyve/rfb.c +++ b/usr/src/cmd/bhyve/rfb.c @@ -3,7 +3,7 @@ * * Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com> * Copyright (c) 2015 Leon Dang - * Copyright 2018 Joyent, Inc. + * Copyright 2020 Joyent, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -803,7 +803,7 @@ rfb_handle(struct rfb_softc *rc, int cfd) * The client then sends the resulting 16-bytes response. */ #ifndef NO_OPENSSL - strncpy(keystr, rc->password, PASSWD_LENGTH); + strncpy((char *)keystr, rc->password, PASSWD_LENGTH); /* VNC clients encrypts the challenge with all the bit fields * in each byte of the password mirrored. @@ -838,7 +838,8 @@ rfb_handle(struct rfb_softc *rc, int cfd) &ks, DES_ENCRYPT); if (memcmp(crypt_expected, buf, AUTH_LENGTH) != 0) { - message = "Auth Failed: Invalid Password."; + message = + (unsigned char *)"Auth Failed: Invalid Password."; sres = htonl(1); } else sres = 0; |