Commit e2b47666 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/misc-next-pull-request' into staging 



Merge misc fixes

A collection of patches I have fixing crypto code and other pieces
without an assigned maintainer

 * Fixes crypto function signatures to be compatible with
   both old and new versions of nettle
 * Fixes deprecation warnings on new nettle
 * Fixes GPL license header typos
 * Documents security implications of monitor usage
 * Optimize linking of capstone to avoid it in tools

# gpg: Signature made Fri 19 Jul 2019 14:24:37 BST
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/misc-next-pull-request:
  crypto: Fix LGPL information in the file headers
  doc: document that the monitor console is a privileged control interface
  configure: only link capstone to emulation targets
  crypto: fix function signatures for nettle 2.7 vs 3
  crypto: switch to modern nettle AES APIs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c054147e b7cbb874

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ obj-$(CONFIG_TCG) += fpu/softfloat.o 
obj-y += target/$(TARGET_BASE_ARCH)/

obj-y += disas.o

obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o

LIBS := $(libs_cpu) $(LIBS)



#########################################################

# Linux user emulator target

configure

+4 −2
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ audio_drv_list="" 
block_drv_rw_whitelist=""

block_drv_ro_whitelist=""

host_cc="cc"

libs_cpu=""

libs_softmmu=""

libs_tools=""

audio_pt_int=""
@@ -5042,12 +5043,12 @@ case "$capstone" in 
    else

      LIBCAPSTONE=libcapstone.a

    fi

    LIBS="-L\$(BUILD_DIR)/capstone -lcapstone $LIBS"

    libs_cpu="-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu"

    ;;



  system)

    QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"

    LIBS="$($pkg_config --libs capstone) $LIBS"

    libs_cpu="$($pkg_config --libs capstone) $libs_cpu"

    ;;



  no)
@@ -6537,6 +6538,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak 
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak

echo "qemu_icondir=$qemu_icondir" >> $config_host_mak

echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak

echo "libs_cpu=$libs_cpu" >> $config_host_mak

echo "libs_softmmu=$libs_softmmu" >> $config_host_mak

echo "GIT=$git" >> $config_host_mak

echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak

crypto/block-luks.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

crypto/block-luks.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

crypto/block-qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of