2
0
mirror of git://git.proxmox.com/git/pve-libspice-server.git synced 2025-08-29 13:38:54 +00:00

move to dget based re-build from Debian as upstream

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-10-22 15:10:28 +02:00
parent 6c083f4514
commit fa754a251c
18 changed files with 31 additions and 940 deletions

View File

@ -1,8 +1,11 @@
RELEASE=4.0
SOURCE=spice
PACKAGE=libspice-server1
PACKAGE=pve-libspice-server1
PKGVERSION=0.14.1
PKGRELEASE=2
PKGVERSION=0.14.2
DEBVERSION=0.14.2-4
PVERELEASE=pve6
VERSION := $(DEBVERSION)~$(PVERELEASE)
PKGDIR=spice-${PKGVERSION}
PKGSRC=${PKGDIR}.tar.bz2
@ -10,8 +13,8 @@ PKGSRC=${PKGDIR}.tar.bz2
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell cat .git/refs/heads/master)
DEB=pve-libspice-server1_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb
DEB_DBG=pve-libspice-server-dev_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb
DEB=$(PACKAGE)_${VERSION}_${ARCH}.deb
DEB_DBG=$(PACKAGE)-dbgsym_${VERSION}_${ARCH}.deb
DEBS=$(DEB) $(DEB_DBG)
all: ${DEBS}
@ -20,32 +23,32 @@ all: ${DEBS}
.PHONY: deb
deb: $(DEB)
$(DEB_DBG): $(DEB)
$(DEB): ${PKGSRC}
echo ${DEBS}
$(DEB): $(SOURCE)_$(PKGVERSION).orig.tar.bz2 $(SOURCE)_$(DEBVERSION).debian.tar.xz
rm -rf ${PKGDIR}
tar xf ${PKGSRC}
# now compile spice server
cp -a debian ${PKGDIR}/debian
cd pki/; cp ca-cert.pem server-cert.pem server-key.pem ../${PKGDIR}/server/tests/pki/
echo "git clone git://git.proxmox.com/git/pve-libspice-server.git\\ngit checkout ${GITVERSION}" > ${PKGDIR}/debian/SOURCE
tar xf $(SOURCE)_$(PKGVERSION).orig.tar.bz2
tar xf $(SOURCE)_$(DEBVERSION).debian.tar.xz -C $(SOURCE)-$(PKGVERSION)
cat changelog.Debian $(PKGDIR)/debian/changelog > $(PKGDIR)/debian/changelog.tmp
mv $(PKGDIR)/debian/changelog.tmp $(PKGDIR)/debian/changelog
cd ${PKGDIR}; dpkg-buildpackage -b -us -uc
lintian ${DEBS}
.PHONY: download
download:
rm -f ${PKGSRC}
wget http://spice-space.org/download/releases/spice-server/spice-${PKGVERSION}.tar.bz2
download: $(SOURCE)_$(PKGVERSION).orig.tar.bz2 $(SOURCE)_$(DEBVERSION).debian.tar.xz
$(SOURCE)_$(PKGVERSION).orig.tar.bz2: $(SOURCE)_$(DEBVERSION).debian.tar.xz
$(SOURCE)_$(DEBVERSION).debian.tar.xz:
dget http://deb.debian.org/debian/pool/main/s/spice/spice_0.14.2-4.dsc
.PHONY: upload
upload: ${DEBS}
tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
distclean: clean
rm -f *.tar.*
.PHONY: clean
clean:
rm -rf *~ debian/*~ *_${ARCH}.deb *.changes *.dsc *.buildinfo ${PKGDIR}
rm -rf *~ debian/*~ *.deb *.changes *.dsc *.buildinfo ${PKGDIR}
.PHONY: dinstall
dinstall: ${DEBS}

11
changelog.Debian Normal file
View File

@ -0,0 +1,11 @@
spice (0.14.2-4~pve6) pve; urgency=medium
[ Michael Tokarev ]
* disable failing test-listen (Closes: #941006)
* add fix-test-qxl-parsing-on-ppc64el-and-armhf.patch
* stop using dh_autoreconf as we do not patch autoconf/automake anymore
[ Proxmox Support Team ]
* rebuild for Debian Buster / Proxmox VE 6
-- Proxmox Support Team <support@proxmox.com> Tue, 22 Oct 2019 15:04:20 +0200

73
debian/changelog vendored
View File

@ -1,73 +0,0 @@
pve-libspice-server (0.14.1-2) unstable; urgency=medium
* Fix CVE-2019-3813
-- Promxox Support Team <support@proxmox.com> Tue, 29 Jan 2019 09:46:41 +0100
pve-libspice-server (0.14.1-1) unstable; urgency=medium
* upgrade to 0.14.1
* replace CELT with libopus
-- Proxmox Support Team <support@proxmox.com> Mon, 15 Oct 2018 11:19:56 +0200
pve-libspice-server (0.12.8-3) unstable; urgency=medium
* Rebuild for PVE 5.0 / Debian Stretch
-- Proxmox Support Team <support@proxmox.com> Fri, 10 Mar 2017 08:55:07 +0100
pve-libspice-server (0.12.8-2) unstable; urgency=medium
* Fix CVE-2016-9577, CVE-2016-9578
-- Proxmox Support Team <support@proxmox.com> Fri, 17 Feb 2017 09:33:44 +0100
pve-libspice-server (0.12.8-1) unstable; urgency=medium
* update to 0.12.8 (Fix CVE-2016-0749, CVE-2016-2150)
-- Proxmox Support Team <support@proxmox.com> Thu, 14 Jul 2016 06:35:24 +0200
pve-libspice-server (0.12.5-2) unstable; urgency=medium
* fix CVE-2015-3247, CVE-2015-5260, CVE-2015-5261
-- Proxmox Support Team <support@proxmox.com> Fri, 16 Oct 2015 10:21:05 +0200
pve-libspice-server (0.12.5-1) unstable; urgency=medium
* new upstream
* compile for debian jessie
-- Proxmox Support Team <support@proxmox.com> Sat, 28 Feb 2015 07:37:45 +0100
pve-libspice-server (0.12.4-3) unstable; urgency=low
* use quilt for patch management
* compile with --with-sasl
* include allow-to-set-sasl-callbacks.patch (required by spiceterm)
-- Proxmox Support Team <support@proxmox.com> Tue, 03 Dec 2013 13:36:51 +0100
pve-libspice-server (0.12.4-2) unstable; urgency=low
* conflict with debian package 'libspice-server1'
-- Proxmox Support Team <support@proxmox.com> Mon, 16 Sep 2013 06:27:09 +0200
pve-libspice-server (0.12.4-1) unstable; urgency=low
* update to 0.12.4
-- Proxmox Support Team <support@proxmox.com> Fri, 19 Jul 2013 05:57:33 +0200
pve-libspice-server (0.12.3-1) unstable; urgency=low
* Initial release
-- Proxmox Support Team <support@proxmox.com> Mon, 24 Jun 2013 11:41:14 +0200

1
debian/compat vendored
View File

@ -1 +0,0 @@
10

58
debian/control vendored
View File

@ -1,58 +0,0 @@
Source: pve-libspice-server
Priority: extra
Maintainer: Proxmox Support Team <support@proxmox.com>
Build-Depends: autotools-dev,
debhelper (>= 8.0.0),
libglib2.0-dev,
libjpeg-dev,
liblz4-dev,
libogg-dev,
libopus-dev,
libpixman-1-dev (>= 0.17.7~),
libsasl2-dev,
libspice-protocol-dev (>= 0.12.14),
libssl-dev,
pkg-config,
python-pyparsing,
quilt,
zlib1g-dev,
Standards-Version: 3.9.3
Section: libs
Package: pve-libspice-server-dev
Section: libdevel
Architecture: amd64
Depends: libpixman-1-dev (>= 0.17.7~),
libssl-dev,
libxinerama-dev,
pve-libspice-server1 (= ${binary:Version}),
${misc:Depends},
Suggests: pkg-config,
Conflicts: libspice-server-dev,
Provides: libspice-server-dev,
Replaces: libspice-server-dev,
Description: Header and development files for SPICE server
SPICE is a remote display system built for virtual environments which
allows you to view a computing 'desktop' environment not only on the
machine where it is running, but from anywhere on the Internet and
from a wide variety of machine architectures.
.
This package contains the header files, static libraries and development
documentation for spice-server.
Package: pve-libspice-server1
Section: libs
Architecture: amd64
Depends: ${misc:Depends},
${shlibs:Depends},
Conflicts: libspice-server1,
Provides: libspice-server1,
Replaces: libspice-server1,
Description: SPICE remote display system server library
SPICE is a remote display system built for virtual environments which
allows you to view a computing 'desktop' environment not only on the
machine where it is running, but from anywhere on the Internet and
from a wide variety of machine architectures.
.
This package contains the run-time libraries for any application that
wishes to be a SPICE server.

543
debian/copyright vendored
View File

@ -1,543 +0,0 @@
Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
Upstream-Name: spice
Source: http://www.spice-space.org/
Files: *
Copyright: Copyright (C) 2009,2010,2011 Red Hat, Inc.
License: LGPL-2.1+
Files: client/windows/stdint.h
Copyright: NOT COPYRIGHTED
License:
Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
THIS SOFTWARE IS NOT COPYRIGHTED
Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
This source code is offered for use in the public domain. You may
use, modify or distribute it freely.
This code is distributed in the hope that it will be useful but
WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
DISCLAIMED. This includes but is not limited to warranties of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Files: spice-common/common/draw.h spice-common/common/messages.h
server/zlib_encoder.h server/jpeg_encoder.h
Copyright: Copyright (C) 2009-2010 Red Hat, Inc.
License: BSD-3-clause
Files: spice-common/common/lines.h spice-common/common/lines.c
Copyright: Copyright 1987, 1998 The Open Group
Copyright 1987 by Digital Equipment Corporation
License:
Copyright 1987, 1998 The Open Group
.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
.
All Rights Reserved
.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
Files: client/windows/my_getopt.cpp
Copyright: Copyright 1997-2001, Benjamin Sittler
License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Files: spice-common/common/lz_decompress_tmpl.c spice-common/common/lz.c
spice-common/common/lz_compress_tmpl.c
Copyright: Copyright 2009 Red Hat, Inc. and/or its affiliates
Copyright (C) 2005, 2006, 2007 Ariya Hidayat (ariya@kde.org)
License: LGPL-2.1+
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.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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
This file incorporates work covered by the following copyright and
permission notice:
.
Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
Copyright (C) 2005 Ariya Hidayat (ariya@kde.org)
.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
.
Files: spice-common/common/lz.h
Copyright: NOT COPYRIGHTED
License: MIT
Files: debian/*
Copyright: 2013 root <Proxmox Support Team <support@proxmox.com>>
License: LGPL-2.1+
License: LGPL-2.1+
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.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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
.
\* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
\* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
\* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
License: CC-BY-SA-3.0
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
.
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
.
1. Definitions
.
a. "Adaptation" means a work based upon the Work, or upon the Work and
other pre-existing works, such as a translation, adaptation, derivative
work, arrangement of music or other alterations of a literary or artistic
work, or phonogram or performance and includes cinematographic adaptations
or any other form in which the Work may be recast, transformed, or adapted
including in any form recognizably derived from the original, except that
a work that constitutes a Collection will not be considered an Adaptation
for the purpose of this License. For the avoidance of doubt, where the
Work is a musical work, performance or phonogram, the synchronization of
the Work in timed-relation with a moving image ("synching") will be
considered an Adaptation for the purpose of this License.
.
b. "Collection" means a collection of literary or artistic works, such as
encyclopedias and anthologies, or performances, phonograms or broadcasts,
or other works or subject matter other than works listed in Section 1(f)
below, which, by reason of the selection and arrangement of their
contents, constitute intellectual creations, in which the Work is included
in its entirety in unmodified form along with one or more other
contributions, each constituting separate and independent works in
themselves, which together are assembled into a collective whole. A work
that constitutes a Collection will not be considered an Adaptation (as
defined below) for the purposes of this License.
.
c. "Creative Commons Compatible License" means a license that is listed at
http://creativecommons.org/compatiblelicenses that has been approved by
Creative Commons as being essentially equivalent to this License,
including, at a minimum, because that license: (i) contains terms that
have the same purpose, meaning and effect as the License Elements of this
License; and, (ii) explicitly permits the relicensing of adaptations of
works made available under that license under this License or a Creative
Commons jurisdiction license with the same License Elements as this
License.
.
d. "Distribute" means to make available to the public the original and
copies of the Work or Adaptation, as appropriate, through sale or other
transfer of ownership.
.
e. "License Elements" means the following high-level license attributes as
selected by Licensor and indicated in the title of this License:
Attribution, ShareAlike.
.
f. "Licensor" means the individual, individuals, entity or entities that
offer(s) the Work under the terms of this License.
.
g. "Original Author" means, in the case of a literary or artistic work,
the individual, individuals, entity or entities who created the Work or if
no individual or entity can be identified, the publisher; and in addition
(i) in the case of a performance the actors, singers, musicians, dancers,
and other persons who act, sing, deliver, declaim, play in, interpret or
otherwise perform literary or artistic works or expressions of folklore;
(ii) in the case of a phonogram the producer being the person or legal
entity who first fixes the sounds of a performance or other sounds; and,
(iii) in the case of broadcasts, the organization that transmits the
broadcast.
.
h. "Work" means the literary and/or artistic work offered under the terms
of this License including without limitation any production in the
literary, scientific and artistic domain, whatever may be the mode or form
of its expression including digital form, such as a book, pamphlet and
other writing; a lecture, address, sermon or other work of the same
nature; a dramatic or dramatico-musical work; a choreographic work or
entertainment in dumb show; a musical composition with or without words;
a cinematographic work to which are assimilated works expressed by a
process analogous to cinematography; a work of drawing, painting,
architecture, sculpture, engraving or lithography; a photographic work to
which are assimilated works expressed by a process analogous to
photography; a work of applied art; an illustration, map, plan, sketch or
three-dimensional work relative to geography, topography, architecture or
science; a performance; a broadcast; a phonogram; a compilation of data to
the extent it is protected as a copyrightable work; or a work performed by
a variety or circus performer to the extent it is not otherwise considered
a literary or artistic work.
.
i. "You" means an individual or entity exercising rights under this
License who has not previously violated the terms of this License with
respect to the Work, or who has received express permission from the
Licensor to exercise rights under this License despite a previous
violation.
.
j. "Publicly Perform" means to perform public recitations of the Work and
to communicate to the public those public recitations, by any means or
process, including by wire or wireless means or public digital
performances; to make available to the public Works in such a way that
members of the public may access these Works from a place and at a place
individually chosen by them; to perform the Work to the public by any
means or process and the communication to the public of the performances
of the Work, including by public digital performance; to broadcast and
rebroadcast the Work by any means including signs, sounds or images.
.
k. "Reproduce" means to make copies of the Work by any means including
without limitation by sound or visual recordings and the right of
fixation and reproducing fixations of the Work, including storage of a
protected performance or phonogram in digital form or other electronic
medium.
.
2. Fair Dealing Rights. Nothing in this License is intended to reduce,
limit, or restrict any uses free from copyright or rights arising from
limitations or exceptions that are provided for in connection with the
copyright protection under copyright law or other applicable laws.
.
3. License Grant. Subject to the terms and conditions of this License,
Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
perpetual (for the duration of the applicable copyright) license to exercise
the rights in the Work as stated below:
.
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the Collections;
.
b. to create and Reproduce Adaptations provided that any such Adaptation,
including any translation in any medium, takes reasonable steps to clearly
label, demarcate or otherwise identify that changes were made to the
original Work. For example, a translation could be marked "The original
work was translated from English to Spanish," or a modification could
indicate "The original work has been modified.";
.
c. to Distribute and Publicly Perform the Work including as incorporated
in Collections; and,
.
d. to Distribute and Publicly Perform Adaptations.
.
e. For the avoidance of doubt:
.
i. Non-waivable Compulsory License Schemes. In those jurisdictions in
which the right to collect royalties through any statutory or compulsory
licensing scheme cannot be waived, the Licensor reserves the exclusive
right to collect such royalties for any exercise by You of the rights
granted under this License;
.
ii. Waivable Compulsory License Schemes. In those jurisdictions in which
the right to collect royalties through any statutory or compulsory
licensing scheme can be waived, the Licensor waives the exclusive right
to collect such royalties for any exercise by You of the rights granted
under this License; and,
.
iii. Voluntary License Schemes. The Licensor waives the right to collect
royalties, whether individually or, in the event that the Licensor is a
member of a collecting society that administers voluntary licensing
schemes, via that society, from any exercise by You of the rights
granted under this License.
.
The above rights may be exercised in all media and formats whether now known
or hereafter devised. The above rights include the right to make such
modifications as are technically necessary to exercise the rights in other
media and formats. Subject to Section 8(f), all rights not expressly granted
by Licensor are hereby reserved.
.
4. Restrictions. The license granted in Section 3 above is expressly made
subject to and limited by the following restrictions:
.
a. You may Distribute or Publicly Perform the Work only under the terms of
this License. You must include a copy of, or the Uniform Resource
Identifier (URI) for, this License with every copy of the Work You
Distribute or Publicly Perform. You may not offer or impose any terms on
the Work that restrict the terms of this License or the ability of the
recipient of the Work to exercise the rights granted to that recipient
under the terms of the License. You may not sublicense the Work. You must
keep intact all notices that refer to this License and to the disclaimer
of warranties with every copy of the Work You Distribute or Publicly
Perform. When You Distribute or Publicly Perform the Work, You may not
impose any effective technological measures on the Work that restrict the
ability of a recipient of the Work from You to exercise the rights granted
to that recipient under the terms of the License. This Section 4(a)
applies to the Work as incorporated in a Collection, but this does not
require the Collection apart from the Work itself to be made subject to
the terms of this License. If You create a Collection, upon notice from
any Licensor You must, to the extent practicable, remove from the
Collection any credit as required by Section 4(c), as requested. If You
create an Adaptation, upon notice from any Licensor You must, to the
extent practicable, remove from the Adaptation any credit as required by
Section 4(c), as requested.
.
b. You may Distribute or Publicly Perform an Adaptation only under the
terms of: (i) this License; (ii) a later version of this License with the
same License Elements as this License; (iii) a Creative Commons
jurisdiction license (either this or a later license version) that
contains the same License Elements as this License (e.g.,
Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
License. If you license the Adaptation under one of the licenses mentioned
in (iv), you must comply with the terms of that license. If you license
the Adaptation under the terms of any of the licenses mentioned in (i),
(ii) or (iii) (the "Applicable License"), you must comply with the terms
of the Applicable License generally and the following provisions: (I) You
must include a copy of, or the URI for, the Applicable License with every
copy of each Adaptation You Distribute or Publicly Perform; (II) You may
not offer or impose any terms on the Adaptation that restrict the terms of
the Applicable License or the ability of the recipient of the Adaptation
to exercise the rights granted to that recipient under the terms of the
Applicable License; (III) You must keep intact all notices that refer to
the Applicable License and to the disclaimer of warranties with every copy
of the Work as included in the Adaptation You Distribute or Publicly
Perform; (IV) when You Distribute or Publicly Perform the Adaptation,
You may not impose any effective technological measures on the Adaptation
that restrict the ability of a recipient of the Adaptation from You to
exercise the rights granted to that recipient under the terms of the
Applicable License. This Section 4(b) applies to the Adaptation as
incorporated in a Collection, but this does not require the Collection
apart from the Adaptation itself to be made subject to the terms of the
Applicable License.
.
c. If You Distribute, or Publicly Perform the Work or any Adaptations
or Collections, You must, unless a request has been made pursuant to
Section 4(a), keep intact all copyright notices for the Work and provide,
reasonable to the medium or means You are utilizing: (i) the name of the
Original Author (or pseudonym, if applicable) if supplied, and/or if the
Original Author and/or Licensor designate another party or parties (e.g.,
a sponsor institute, publishing entity, journal) for attribution
("Attribution Parties") in Licensor's copyright notice, terms of service
or by other reasonable means, the name of such party or parties; (ii) the
title of the Work if supplied; (iii) to the extent reasonably practicable,
the URI, if any, that Licensor specifies to be associated with the Work,
unless such URI does not refer to the copyright notice or licensing
information for the Work; and (iv) , consistent with Ssection 3(b), in the
case of an Adaptation, a credit identifying the use of the Work in the
Adaptation (e.g., "French translation of the Work by Original Author,"
or "Screenplay based on original Work by Original Author"). The credit
required by this Section 4(c) may be implemented in any reasonable manner;
provided, however, that in the case of a Adaptation or Collection, at a
minimum such credit will appear, if a credit for all contributing authors
of the Adaptation or Collection appears, then as part of these credits and
in a manner at least as prominent as the credits for the other
contributing authors. For the avoidance of doubt, You may only use the
credit required by this Section for the purpose of attribution in the
manner set out above and, by exercising Your rights under this License,
You may not implicitly or explicitly assert or imply any connection with,
sponsorship or endorsement by the Original Author, Licensor and/or
Attribution Parties, as appropriate, of You or Your use of the Work,
without the separate, express prior written permission of the Original
Author, Licensor and/or Attribution Parties.
.
d. Except as otherwise agreed in writing by the Licensor or as may be
otherwise permitted by applicable law, if You Reproduce, Distribute or
Publicly Perform the Work either by itself or as part of any Adaptations
or Collections, You must not distort, mutilate, modify or take other
derogatory action in relation to the Work which would be prejudicial to
the Original Author's honor or reputation. Licensor agrees that in those
jurisdictions (e.g. Japan), in which any exercise of the right granted in
Section 3(b) of this License (the right to make Adaptations) would be
deemed to be a distortion, mutilation, modification or other derogatory
action prejudicial to the Original Author's honor and reputation, the
Licensor will waive or not assert, as appropriate, this Section, to the
fullest extent permitted by the applicable national law, to enable You to
reasonably exercise Your right under Section 3(b) of this License (right
to make Adaptations) but not otherwise.
.
5. Representations, Warranties and Disclaimer
.
UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
.
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW,
IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING
OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
.
7. Termination
.
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this License.
Individuals or entities who have received Adaptations or Collections from
You under this License, however, will not have their licenses terminated
provided such individuals or entities remain in full compliance with
those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination
of this License.
.
b. Subject to the above terms and conditions, the license granted here is
perpetual (for the duration of the applicable copyright in the Work).
Notwithstanding the above, Licensor reserves the right to release the
Work under different license terms or to stop distributing the Work at any
time; provided, however that any such election will not serve to withdraw
this License (or any other license that has been, or is required to be,
granted under the terms of this License), and this License will continue
in full force and effect unless terminated as stated above.
.
8. Miscellaneous
.
a. Each time You Distribute or Publicly Perform the Work or a Collection,
the Licensor offers to the recipient a license to the Work on the same
terms and conditions as the license granted to You under this License.
.
b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
offers to the recipient a license to the original Work on the same terms
and conditions as the license granted to You under this License.
.
c. If any provision of this License is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of the
remainder of the terms of this License, and without further action by the
parties to this agreement, such provision shall be reformed to the minimum
extent necessary to make such provision valid and enforceable.
.
d. No term or provision of this License shall be deemed waived and no
breach consented to unless such waiver or consent shall be in writing and
signed by the party to be charged with such waiver or consent.
.
e. This License constitutes the entire agreement between the parties with
respect to the Work licensed here. There are no understandings, agreements
or representations with respect to the Work not specified here. Licensor
shall not be bound by any additional provisions that may appear in any
communication from You. This License may not be modified without the
mutual written agreement of the Licensor and You.
.
f. The rights granted under, and the subject matter referenced, in this
License were drafted utilizing the terminology of the Berne Convention for
the Protection of Literary and Artistic Works (as amended on September 28,
1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the
WIPO Performances and Phonograms Treaty of 1996 and the Universal
Copyright Convention (as revised on July 24, 1971). These rights and
subject matter take effect in the relevant jurisdiction in which the
License terms are sought to be enforced according to the corresponding
provisions of the implementation of those treaty provisions in the
applicable national law. If the standard suite of rights granted under
applicable copyright law includes additional rights not granted under this
License, such additional rights are deemed to be included in the License;
this License is not intended to restrict the license of any rights under
applicable law.

View File

@ -1,102 +0,0 @@
From 6eff47e72cb2f23d168be58bab8bdd60df49afd0 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu, 29 Nov 2018 14:18:39 +0100
Subject: [spice-server] memslot: Fix off-by-one error in group/slot boundary
check
RedMemSlotInfo keeps an array of groups, and each group contains an
array of slots. Unfortunately, these checks are off by 1, they check
that the index is greater or equal to the number of elements in the
array, while these arrays are 0 based. The check should only check for
strictly greater than the number of elements.
For the group array, this is not a big issue, as these memslot groups
are created by spice-server users (eg QEMU), and the group ids used to
index that array are also generated by the spice-server user, so it
should not be possible for the guest to set them to arbitrary values.
The slot id is more problematic, as it's calculated from a QXLPHYSICAL
address, and such addresses are usually set by the guest QXL driver, so
the guest can set these to arbitrary values, including malicious values,
which are probably easy to build from the guest PCI configuration.
This patch fixes the arrays bound check, and adds a test case for this.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
server/memslot.c | 4 ++--
server/tests/test-qxl-parsing.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/server/memslot.c b/server/memslot.c
index b27324efb..fb3d5cfd5 100644
--- a/server/memslot.c
+++ b/server/memslot.c
@@ -97,13 +97,13 @@ void *memslot_get_virt(RedMemSlotInfo *info, QXLPHYSICAL addr, uint32_t add_size
MemSlot *slot;
- if (group_id > info->num_memslots_groups) {
+ if (group_id >= info->num_memslots_groups) {
spice_critical("group_id too big");
return NULL;
}
slot_id = memslot_get_id(info, addr);
- if (slot_id > info->num_memslots) {
+ if (slot_id >= info->num_memslots) {
print_memslots(info);
spice_critical("slot_id %d too big, addr=%" PRIx64, slot_id, addr);
return NULL;
diff --git a/server/tests/test-qxl-parsing.c b/server/tests/test-qxl-parsing.c
index 8565239f0..447425984 100644
--- a/server/tests/test-qxl-parsing.c
+++ b/server/tests/test-qxl-parsing.c
@@ -98,6 +98,31 @@ static void deinit_qxl_surface(QXLSurfaceCmd *qxl)
g_free(from_physical(qxl->u.surface_create.data));
}
+static void test_memslot_invalid_group_id(void)
+{
+ RedMemSlotInfo mem_info;
+ init_meminfo(&mem_info);
+
+ memslot_get_virt(&mem_info, 0, 16, 1);
+}
+
+static void test_memslot_invalid_slot_id(void)
+{
+ RedMemSlotInfo mem_info;
+ init_meminfo(&mem_info);
+
+ memslot_get_virt(&mem_info, 1 << mem_info.memslot_id_shift, 16, 0);
+}
+
+static void test_memslot_invalid_addresses(void)
+{
+ g_test_trap_subprocess("/server/memslot-invalid-addresses/subprocess/group_id", 0, 0);
+ g_test_trap_assert_stderr("*group_id too big*");
+
+ g_test_trap_subprocess("/server/memslot-invalid-addresses/subprocess/slot_id", 0, 0);
+ g_test_trap_assert_stderr("*slot_id 1 too big*");
+}
+
static void test_no_issues(void)
{
RedMemSlotInfo mem_info;
@@ -317,6 +342,11 @@ int main(int argc, char *argv[])
{
g_test_init(&argc, &argv, NULL);
+ /* try to use invalid memslot group/slot */
+ g_test_add_func("/server/memslot-invalid-addresses", test_memslot_invalid_addresses);
+ g_test_add_func("/server/memslot-invalid-addresses/subprocess/group_id", test_memslot_invalid_group_id);
+ g_test_add_func("/server/memslot-invalid-addresses/subprocess/slot_id", test_memslot_invalid_slot_id);
+
/* try to create a surface with no issues, should succeed */
g_test_add_func("/server/qxl-parsing-no-issues", test_no_issues);
--
2.19.2

View File

@ -1,56 +0,0 @@
Index: new/server/spice-server.syms
===================================================================
--- new.orig/server/spice-server.syms
+++ new/server/spice-server.syms
@@ -148,6 +148,7 @@ global:
SPICE_SERVER_0.12.5 {
global:
+ spice_server_set_sasl_callbacks;
spice_server_get_best_playback_rate;
spice_server_set_playback_rate;
spice_server_get_best_record_rate;
Index: new/server/spice-server.h
===================================================================
--- new.orig/server/spice-server.h
+++ new/server/spice-server.h
@@ -53,6 +53,7 @@ int spice_server_set_exit_on_disconnect(
int spice_server_set_noauth(SpiceServer *s);
int spice_server_set_sasl(SpiceServer *s, int enabled);
int spice_server_set_sasl_appname(SpiceServer *s, const char *appname);
+int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb);
int spice_server_set_ticket(SpiceServer *s, const char *passwd, int lifetime,
int fail_if_connected, int disconnect_if_connected);
int spice_server_set_tls(SpiceServer *s, int port,
Index: new/server/red-stream.c
===================================================================
--- new.orig/server/red-stream.c
+++ new/server/red-stream.c
@@ -48,6 +48,18 @@ extern SpiceCoreInterface *core;
#if HAVE_SASL
#include <sasl/sasl.h>
+static sasl_callback_t *sasl_callbacks = NULL;
+
+SPICE_GNUC_VISIBLE int spice_server_set_sasl_callbacks(SpiceServer *s, void *saslcb)
+{
+#if HAVE_SASL
+ sasl_callbacks = (sasl_callback_t *)saslcb;
+ return 0;
+#else
+ return -1;
+#endif
+}
+
typedef struct RedSASL {
sasl_conn_t *conn;
@@ -976,7 +988,7 @@ bool red_sasl_start_auth(RedsStream *st
NULL, /* User realm */
localAddr,
remoteAddr,
- NULL, /* Callbacks, not needed */
+ sasl_callbacks,
SASL_SUCCESS_DATA,
&sasl->conn);
free(localAddr);

View File

@ -1,2 +0,0 @@
allow-to-set-sasl-callbacks.patch
0001-memslot-Fix-off-by-one-error-in-group-slot-boundary-.patch

View File

@ -1,3 +0,0 @@
NEWS
README
debian/SOURCE

View File

@ -1,3 +0,0 @@
usr/include/*
usr/lib/lib*.so
usr/lib/pkgconfig/*

View File

@ -1 +0,0 @@
debian/SOURCE

View File

@ -1 +0,0 @@
usr/lib/lib*.so.*

13
debian/rules vendored
View File

@ -1,13 +0,0 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
override_dh_auto_configure:
./configure --prefix=/usr --with-sasl --disable-smartcard --disable-celt051 --disable-gstreamer --enable-lz4
override_dh_auto_test:
dh_auto_test --max-parallel=1
%:
dh $@ -with quilt --with autotools-dev

View File

@ -1,21 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDiTCCAnGgAwIBAgIUDeSYSCUZyE4QEHTKhQyyfPgqNOwwDQYJKoZIhvcNAQEL
BQAwVDELMAkGA1UEBhMCQVQxDTALBgNVBAcMBFdpZW4xJjAkBgNVBAoMHVByb3ht
b3ggc2VydmVyIFNvbHV0aW9ucyBHbWJIMQ4wDAYDVQQDDAVteSBDQTAeFw0xOTAz
MjExMDEzMzVaFw0yMjAzMjAxMDEzMzVaMFQxCzAJBgNVBAYTAkFUMQ0wCwYDVQQH
DARXaWVuMSYwJAYDVQQKDB1Qcm94bW94IHNlcnZlciBTb2x1dGlvbnMgR21iSDEO
MAwGA1UEAwwFbXkgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ
1LkylnfDSuvaJzrej81Mok65DZUyVzC7/C1YgLos+kByst9QTVy7oudB9mUYHHgE
oIRPHv4pWoutgbPyZdJRkGcgSqTRi/grCIMs7AkrQVidpVQqyaIQvq8BgHm7yhTS
qkJRIXSGoZN6JEf2zGdOkSHYSCEoMvXjJhPugzkmqhLQ0s6gALuIU6kh8MustcdD
k/TRtZhTN/TlV+7P32Pjl/Mj018BVsqBggi8engvR+MWUfzcsqrBfTd8eMMsuqIm
3yUtW4m6unSrXUALKxJIZ0tQ4GYlrbX1GLjU8s81Dhyc3RpRwRmLPYrYhphumgQj
6NGxp2Kmx+BCEp+/wI/dAgMBAAGjUzBRMB0GA1UdDgQWBBSYSDn9Ciz1REePvP6a
pi/NUnpxFzAfBgNVHSMEGDAWgBSYSDn9Ciz1REePvP6api/NUnpxFzAPBgNVHRMB
Af8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCNQOS4BK2pyyv4NN6PXzOxd2+S
+tBzGqAp89nWR+whrPA45TFiLYBJORdtDMO3frwiPAR0iAhg7PogJFdo5boAXe82
vO2xhxX9BhDlJQ1NBsHKN/+fGHdYK9VfBW/xb8oiyRdVT90+EMvpVQ7mFYVvjHDa
376SAExUStyj4Kc/hhSd9xWWUkqrbsmmTMJD3IDybo+Mb6wgFXPPDR+gXI71xD74
oNoVfjrvnLzOaqpn17Kccx5re4tarL5fzuvT9EUuzqlhSzB494la2wfnhrNpf6W3
J49KfS3gPyr3yMgLGmX1Mw/+2lnusYTIvAweL2y3sOjFeuqzIVxVgEhKV9z0
-----END CERTIFICATE-----

View File

@ -1,19 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDIDCCAggCAQEwDQYJKoZIhvcNAQELBQAwVDELMAkGA1UEBhMCQVQxDTALBgNV
BAcMBFdpZW4xJjAkBgNVBAoMHVByb3htb3ggc2VydmVyIFNvbHV0aW9ucyBHbWJI
MQ4wDAYDVQQDDAVteSBDQTAeFw0xOTAzMjExMDE0NDZaFw0yMjAzMjAxMDE0NDZa
MFgxCzAJBgNVBAYTAkFUMQ0wCwYDVQQHDARXaWVuMSYwJAYDVQQKDB1Qcm94bW94
IHNlcnZlciBTb2x1dGlvbnMgR21iSDESMBAGA1UEAwwJMTI3LjAuMC4xMIIBIjAN
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs+bYOU1XDBNBvyPrgGLw8R6DvHDs
jdE6kAlrK7p+h+3ierdMA4DzWx6msLR1Ucmc5RjoZAwdo4MN9h71cgC18MgI0xEI
LLzffmjXLzAyDDE11fvtCWv227n1ltwNIzymKYdh+Awf5kqb/rFH1ZreChNTe7op
+u9DfHbAFfMJxDKn00eibloxeGU7MZqYgNRdI20/GCsy/iCRyc0mf4IMCEud1Kki
ns0rFR2N2FAV8VywYJ2LOcnYjsk18D0Ch05SVjK5/9KLiE8KxbyNL6WgKNy+yGaa
60TVzD/qVc8J6uZDUftz4y5xmxjKM03srUNThb/MAFTXBzb6G7oTOzshHQIDAQAB
MA0GCSqGSIb3DQEBCwUAA4IBAQBuKVUVRV/BpSQBKbwttvx7dM0KWGsxPM0Eao79
vYH4lNOtSCvrh4Um2Xlb33zzyWJDUIrAkf+I8PJmVXfg0lbur33WQm8sUPr03pE4
ZyB3/tGeTnHvbG909mIgi6tIFNOaaucO96EV83qoYZGDToavHDCHy2T/Dy9Ad7Mb
3tAxdjkoB2Z3nTgg720mky8yKt+BiNESPS5JskPAo+u1R8LtOq4/7vFHRHTXOicG
L5avIKg/G08fW0AsGBqd1wTchiMcvNd4SWS5zZaT+VxNSoPw9UWfEkqifGOp+D3Z
Ke6HI5lN3w6kEdOhnzz64XjpGB6bTm8qYa8xXUaAzEJGww4t
-----END CERTIFICATE-----

View File

@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAs+bYOU1XDBNBvyPrgGLw8R6DvHDsjdE6kAlrK7p+h+3ierdM
A4DzWx6msLR1Ucmc5RjoZAwdo4MN9h71cgC18MgI0xEILLzffmjXLzAyDDE11fvt
CWv227n1ltwNIzymKYdh+Awf5kqb/rFH1ZreChNTe7op+u9DfHbAFfMJxDKn00ei
bloxeGU7MZqYgNRdI20/GCsy/iCRyc0mf4IMCEud1Kkins0rFR2N2FAV8VywYJ2L
OcnYjsk18D0Ch05SVjK5/9KLiE8KxbyNL6WgKNy+yGaa60TVzD/qVc8J6uZDUftz
4y5xmxjKM03srUNThb/MAFTXBzb6G7oTOzshHQIDAQABAoIBAQCu75rynbI3m8Ij
C9rFTXDeBr4zT9u3S+2WgpIkQ4UmyLuiePsBrTL3OCb/TXuHvHVEkaPpJZ7skVPS
MOibovVI3js2gylf14m8clZNHKCOGowvOHqW3tV9dKbLu89KpH8vguZRPfkHByYJ
1Hn1zFJ9ma1kcvK/gEovjYnbzimBDd62PvgY+tnpO+3LOzaDS4nnxyzrjK7M887P
5Qrm4s3DG/6/r/3WyixMiyYuwRymaxX8lvgyw10HIBZhDF8vl8X5g1IQjgt1riCV
bAmXpFIqPG8tHqRrsXpG1wi5QPlKA3P5PbVYda63B26kKRgoxdHi1HDDELj3MCQA
RgZvRFwBAoGBAOV6Hl7a+VOhI2Mletr5FolPCYZtIkqVAQFvoeS0DycNrGYsg3Ro
bIfQQF3G157stSlsWjMe6Q0jyP0oO4THluUeQSJCzNPhQrzrEpIwMU/zl/Ps25KH
tHDWixCyCy1ncKDUlp1kAv6mhEbegTnqoTaKElGY4zOYgVz4TIuHbESxAoGBAMix
3hIulhK4o8SbrI5Lo0s8YRE5vzWQYjtuuIzh0zijjpAtpclv3qo/b2X0IfjBZMME
yyJVYm81R7Qd7ZDKOrbe0uNO25H5NwVGhyX7WWhhbhUOAZxN4VrFbpnxoA0PVLwl
6U9/k0kgdDmgrNVlYYpG6oXxbrKiJ9i3y1eKX24tAoGAKX4dQ7WAY5i9V04Nms5z
Pryl0kKlcqrilanjsgDExKD6TTc7Ra8kAKKtIMe1cS0HzMekv52VMiUIUI4XxPh5
1k/UIyfE9YLDmHlA0GIaaIR5M0feo+4ZuFVyq8AluT385XfLDAZrbDQbstzErP45
zCzHBy4H1up6aZ8T6B7CeuECgYEAuwcW3nbPoC61X3l7uze9u1VPWBAqoq4k/SHX
lmK0xmmVZ8NCZpB8PsfS9n4mUn1Xe24yJ5LOorhSVAY35+CuCtFoUjCg6k4G+kGZ
nMm5rk5tme1tjs39Huwyf//umX0aCCSEYnOPPGykIzgbGNrbpVMlJyGxeYMoAwx0
0OXAvRkCgYBY2l05dIekrl/s4HJ7TV2+b9U/Ik8CUfW7VecSX6JEArBvPTkQvLzw
Q90yNwoyB8mJKL08chPWXz3NuWb4Ua5HHnDdi1ZtBWUONKqSYIIfTu9crVhJXOQF
/SUF8JQM4FvHGmC9pua1MDHXnFbIIF5afn1cxh6GCOWcM5VOxl0Q4g==
-----END RSA PRIVATE KEY-----

Binary file not shown.