rpms/xen/FC-6 pygrub-cosmetics.patch, NONE, 1.1 xen-logfile-O_APPEND.patch, NONE, 1.1 xen-vmxassist-load16.patch, NONE, 1.1 xen-vncpassword-5.patch, NONE, 1.1 xen-vncpassword-pvfb-2.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 sources, 1.42, 1.43 xen.spec, 1.157, 1.158 xen-blktap-patches.patch, 1.3, NONE xen-revert-gzip.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 14 19:27:32 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/xen/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30363
Modified Files:
.cvsignore sources xen.spec
Added Files:
pygrub-cosmetics.patch xen-logfile-O_APPEND.patch
xen-vmxassist-load16.patch xen-vncpassword-5.patch
xen-vncpassword-pvfb-2.patch
Removed Files:
xen-blktap-patches.patch xen-revert-gzip.patch
Log Message:
- Update to xen-3.0.3-8.rhel5.
pygrub-cosmetics.patch:
pygrub | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE pygrub-cosmetics.patch ---
diff -r b21246720fde tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub Mon Oct 30 17:35:11 2006 +0000
+++ b/tools/pygrub/src/pygrub Mon Oct 30 17:56:44 2006 -0500
@@ -113,7 +113,8 @@ class GrubLineEditor(curses.textpad.Text
elif ch == curses.ascii.SOH: # ^a
self.pos = 0
elif ch in (curses.ascii.STX,curses.KEY_LEFT):
- self.pos -= 1
+ if self.pos > 0:
+ self.pos -= 1
elif ch in (curses.ascii.BS,curses.KEY_BACKSPACE):
if self.pos > 0:
self.pos -= 1
@@ -123,7 +124,8 @@ class GrubLineEditor(curses.textpad.Text
elif ch == curses.ascii.ENQ: # ^e
self.pos = len(self.line)
elif ch in (curses.ascii.ACK, curses.KEY_RIGHT):
- self.pos +=1
+ if self.pos <= len(self.line):
+ self.pos +=1
elif ch == curses.ascii.VT: # ^k
self.line = self.line[:self.pos]
else:
@@ -415,6 +417,9 @@ class Grub:
self.selected_image = 0
elif self.selected_image >= len(self.cf.images):
self.selected_image = len(self.cf.images) - 1
+
+ if (mytime >= int(timeout)):
+ self.isdone = True
def get_entry_idx(cf, entry):
# first, see if the given entry is numeric
xen-logfile-O_APPEND.patch:
SrvDaemon.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xen-logfile-O_APPEND.patch ---
# HG changeset patch
# User kfraser at localhost.localdomain
# Date 1161768423 -3600
# Node ID 0c7923eb6b9846c92f1c15486e06ee9745bcf676
# Parent 410df40afc014555ce7bfcad2852de9e6d0425f0
[XEND] Open xend-debug.log in append mode.
Signed-off-by: John Levon <john.levon at sun.com>
diff -r 410df40afc01 -r 0c7923eb6b98 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Wed Oct 25 10:25:18 2006 +0100
+++ b/tools/python/xen/xend/server/SrvDaemon.py Wed Oct 25 10:27:03 2006 +0100
@@ -106,12 +106,12 @@ class Daemon:
os.close(2)
if XEND_DEBUG:
os.open('/dev/null', os.O_RDONLY)
- os.open(XEND_DEBUG_LOG, os.O_WRONLY|os.O_CREAT)
+ os.open(XEND_DEBUG_LOG, os.O_WRONLY|os.O_CREAT|os.O_APPEND)
os.dup(1)
else:
os.open('/dev/null', os.O_RDWR)
os.dup(0)
- os.open(XEND_DEBUG_LOG, os.O_WRONLY|os.O_CREAT)
+ os.open(XEND_DEBUG_LOG, os.O_WRONLY|os.O_CREAT|os.O_APPEND)
def start(self, trace=0):
xen-vmxassist-load16.patch:
vm86.c | 87 ++++++++++++++++++++++++++---------------------------------------
1 files changed, 36 insertions(+), 51 deletions(-)
--- NEW FILE xen-vmxassist-load16.patch ---
diff -r 52ae8dd4bc75 tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c Tue Oct 17 22:09:52 2006 +0100
+++ b/tools/firmware/vmxassist/vm86.c Thu Nov 09 01:24:57 2006 +0000
@@ -847,6 +847,18 @@ load_seg(unsigned long sel, uint32_t *ba
}
/*
+ * Emulate a protected mode segment load, falling back to clearing it if
+ * the descriptor was invalid.
+ */
+static void
+load_or_clear_seg(unsigned long sel, uint32_t *base, uint32_t *limit, union vmcs_arbytes *arbytes)
+{
+ if (!load_seg(sel, base, limit, arbytes))
+ load_seg(0, base, limit, arbytes);
+}
+
+
+/*
* Transition to protected mode
*/
static void
@@ -857,8 +869,6 @@ protected_mode(struct regs *regs)
oldctx.eip = regs->eip;
oldctx.esp = regs->uesp;
oldctx.eflags = regs->eflags;
-
- memset(&saved_rm_regs, 0, sizeof(struct regs));
/* reload all segment registers */
if (!load_seg(regs->cs, &oldctx.cs_base,
@@ -866,55 +876,16 @@ protected_mode(struct regs *regs)
panic("Invalid %%cs=0x%x for protected mode\n", regs->cs);
oldctx.cs_sel = regs->cs;
- if (load_seg(regs->ves, &oldctx.es_base,
- &oldctx.es_limit, &oldctx.es_arbytes))
- oldctx.es_sel = regs->ves;
- else {
- load_seg(0, &oldctx.es_base,
- &oldctx.es_limit, &oldctx.es_arbytes);
- oldctx.es_sel = 0;
- saved_rm_regs.ves = regs->ves;
- }
-
- if (load_seg(regs->uss, &oldctx.ss_base,
- &oldctx.ss_limit, &oldctx.ss_arbytes))
- oldctx.ss_sel = regs->uss;
- else {
- load_seg(0, &oldctx.ss_base,
- &oldctx.ss_limit, &oldctx.ss_arbytes);
- oldctx.ss_sel = 0;
- saved_rm_regs.uss = regs->uss;
- }
-
- if (load_seg(regs->vds, &oldctx.ds_base,
- &oldctx.ds_limit, &oldctx.ds_arbytes))
- oldctx.ds_sel = regs->vds;
- else {
- load_seg(0, &oldctx.ds_base,
- &oldctx.ds_limit, &oldctx.ds_arbytes);
- oldctx.ds_sel = 0;
- saved_rm_regs.vds = regs->vds;
- }
-
- if (load_seg(regs->vfs, &oldctx.fs_base,
- &oldctx.fs_limit, &oldctx.fs_arbytes))
- oldctx.fs_sel = regs->vfs;
- else {
- load_seg(0, &oldctx.fs_base,
- &oldctx.fs_limit, &oldctx.fs_arbytes);
- oldctx.fs_sel = 0;
- saved_rm_regs.vfs = regs->vfs;
- }
-
- if (load_seg(regs->vgs, &oldctx.gs_base,
- &oldctx.gs_limit, &oldctx.gs_arbytes))
- oldctx.gs_sel = regs->vgs;
- else {
- load_seg(0, &oldctx.gs_base,
- &oldctx.gs_limit, &oldctx.gs_arbytes);
- oldctx.gs_sel = 0;
- saved_rm_regs.vgs = regs->vgs;
- }
+ load_or_clear_seg(oldctx.es_sel, &oldctx.es_base,
+ &oldctx.es_limit, &oldctx.es_arbytes);
+ load_or_clear_seg(oldctx.ss_sel, &oldctx.ss_base,
+ &oldctx.ss_limit, &oldctx.ss_arbytes);
+ load_or_clear_seg(oldctx.ds_sel, &oldctx.ds_base,
+ &oldctx.ds_limit, &oldctx.ds_arbytes);
+ load_or_clear_seg(oldctx.fs_sel, &oldctx.fs_base,
+ &oldctx.fs_limit, &oldctx.fs_arbytes);
+ load_or_clear_seg(oldctx.gs_sel, &oldctx.gs_base,
+ &oldctx.gs_limit, &oldctx.gs_arbytes);
/* initialize jump environment to warp back to protected mode */
regs->cs = CODE_SELECTOR;
@@ -1002,6 +973,16 @@ set_mode(struct regs *regs, enum vm86_mo
case VM86_REAL_TO_PROTECTED:
if (mode == VM86_REAL) {
regs->eflags |= EFLAGS_TF;
+ saved_rm_regs.vds = regs->vds;
+ saved_rm_regs.ves = regs->ves;
+ saved_rm_regs.vfs = regs->vfs;
+ saved_rm_regs.vgs = regs->vgs;
+ saved_rm_regs.uss = regs->uss;
+ oldctx.ds_sel = 0;
+ oldctx.es_sel = 0;
+ oldctx.fs_sel = 0;
+ oldctx.gs_sel = 0;
+ oldctx.ss_sel = 0;
break;
} else if (mode == VM86_REAL_TO_PROTECTED) {
break;
@@ -1262,6 +1243,10 @@ opcode(struct regs *regs)
else
regs->ves = pop16(regs);
TRACE((regs, regs->eip - eip, "pop %%es"));
+ if (mode == VM86_REAL_TO_PROTECTED) {
+ saved_rm_regs.ves = 0;
+ oldctx.es_sel = regs->ves;
+ }
return OPC_EMULATED;
case 0x0F: /* two byte opcode */
xen-vncpassword-5.patch:
examples/xend-config.sxp | 4
examples/xmexample.hvm | 5
examples/xmexample.vti | 5
ioemu/Makefile.target | 4
ioemu/d3des.c | 434 ++++++++++++++++++++++++++++++++++++++++++++
ioemu/d3des.h | 51 +++++
ioemu/vl.c | 8
ioemu/vl.h | 4
ioemu/vnc.c | 110 ++++++++++-
ioemu/xenstore.c | 51 +++++
python/xen/xend/XendRoot.py | 6
python/xen/xend/image.py | 22 ++
python/xen/xm/create.py | 5
13 files changed, 705 insertions(+), 4 deletions(-)
--- NEW FILE xen-vncpassword-5.patch ---
diff -ruN xen-3.0.3_0-src.orig/tools/examples/xend-config.sxp xen-3.0.3_0-src.new/tools/examples/xend-config.sxp
--- xen-3.0.3_0-src.orig/tools/examples/xend-config.sxp 2006-10-19 11:28:25.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/examples/xend-config.sxp 2006-10-19 11:29:18.000000000 -0400
@@ -137,3 +137,7 @@
# to 127.0.0.1 To restore old 'listen everywhere' behaviour
# set this to 0.0.0.0
#(vnc-listen '127.0.0.1')
+
+# The default password for VNC console on HVM domain.
+# Empty string is no authentication.
+(vncpasswd '')
diff -ruN xen-3.0.3_0-src.orig/tools/examples/xmexample.hvm xen-3.0.3_0-src.new/tools/examples/xmexample.hvm
--- xen-3.0.3_0-src.orig/tools/examples/xmexample.hvm 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/examples/xmexample.hvm 2006-10-19 11:28:49.000000000 -0400
@@ -150,6 +150,11 @@
#vncconsole=0
#----------------------------------------------------------------------------
+# set password for domain's VNC console
+# default is depents on vncpasswd in xend-config.sxp
+vncpasswd=''
+
+#----------------------------------------------------------------------------
# no graphics, use serial port
#nographic=0
diff -ruN xen-3.0.3_0-src.orig/tools/examples/xmexample.vti xen-3.0.3_0-src.new/tools/examples/xmexample.vti
--- xen-3.0.3_0-src.orig/tools/examples/xmexample.vti 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/examples/xmexample.vti 2006-10-19 11:28:49.000000000 -0400
@@ -95,6 +95,11 @@
#vncconsole=0
#----------------------------------------------------------------------------
+# set password for domain's VNC console
+# default is depents on vncpasswd in xend-config.sxp
+vncpasswd=''
+
+#----------------------------------------------------------------------------
# no graphics, use serial port
#nographic=0
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/d3des.c xen-3.0.3_0-src.new/tools/ioemu/d3des.c
--- xen-3.0.3_0-src.orig/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
+++ xen-3.0.3_0-src.new/tools/ioemu/d3des.c 2006-10-19 11:28:49.000000000 -0400
@@ -0,0 +1,434 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
+ * triple-length support removed for use in VNC. Also the bytebit[] array
+ * has been reversed so that the most significant bit in each byte of the
+ * key is ignored, not the least significant.
+ *
+ * These changes are:
+ * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+ *
+ * This software 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.
+ */
+
+/* D3DES (V5.09) -
+ *
+ * A portable, public domain, version of the Data Encryption Standard.
+ *
+ * Written with Symantec's THINK (Lightspeed) C by Richard Outerbridge.
+ * Thanks to: Dan Hoey for his excellent Initial and Inverse permutation
+ * code; Jim Gillogly & Phil Karn for the DES key schedule code; Dennis
+ * Ferguson, Eric Young and Dana How for comparing notes; and Ray Lau,
+ * for humouring me on.
+ *
+ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
+ * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
+ */
+
+#include "d3des.h"
+
+static void scrunch(unsigned char *, unsigned long *);
+static void unscrun(unsigned long *, unsigned char *);
+static void desfunc(unsigned long *, unsigned long *);
+static void cookey(unsigned long *);
+
+static unsigned long KnL[32] = { 0L };
+
+static unsigned short bytebit[8] = {
+ 01, 02, 04, 010, 020, 040, 0100, 0200 };
+
+static unsigned long bigbyte[24] = {
+ 0x800000L, 0x400000L, 0x200000L, 0x100000L,
+ 0x80000L, 0x40000L, 0x20000L, 0x10000L,
+ 0x8000L, 0x4000L, 0x2000L, 0x1000L,
+ 0x800L, 0x400L, 0x200L, 0x100L,
+ 0x80L, 0x40L, 0x20L, 0x10L,
+ 0x8L, 0x4L, 0x2L, 0x1L };
+
+/* Use the key schedule specified in the Standard (ANSI X3.92-1981). */
+
+static unsigned char pc1[56] = {
+ 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17,
+ 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35,
+ 62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21,
+ 13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 };
+
+static unsigned char totrot[16] = {
+ 1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 };
+
+static unsigned char pc2[48] = {
+ 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9,
+ 22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1,
+ 40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
+ 43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 };
+
+void deskey(key, edf) /* Thanks to James Gillogly & Phil Karn! */
+unsigned char *key;
+int edf;
+{
+ register int i, j, l, m, n;
+ unsigned char pc1m[56], pcr[56];
+ unsigned long kn[32];
+
+ for ( j = 0; j < 56; j++ ) {
+ l = pc1[j];
+ m = l & 07;
+ pc1m[j] = (key[l >> 3] & bytebit[m]) ? 1 : 0;
+ }
+ for( i = 0; i < 16; i++ ) {
+ if( edf == DE1 ) m = (15 - i) << 1;
+ else m = i << 1;
+ n = m + 1;
+ kn[m] = kn[n] = 0L;
+ for( j = 0; j < 28; j++ ) {
+ l = j + totrot[i];
+ if( l < 28 ) pcr[j] = pc1m[l];
+ else pcr[j] = pc1m[l - 28];
+ }
+ for( j = 28; j < 56; j++ ) {
+ l = j + totrot[i];
+ if( l < 56 ) pcr[j] = pc1m[l];
+ else pcr[j] = pc1m[l - 28];
+ }
+ for( j = 0; j < 24; j++ ) {
+ if( pcr[pc2[j]] ) kn[m] |= bigbyte[j];
+ if( pcr[pc2[j+24]] ) kn[n] |= bigbyte[j];
+ }
+ }
+ cookey(kn);
+ return;
+ }
+
+static void cookey(raw1)
+register unsigned long *raw1;
+{
+ register unsigned long *cook, *raw0;
+ unsigned long dough[32];
+ register int i;
+
+ cook = dough;
+ for( i = 0; i < 16; i++, raw1++ ) {
+ raw0 = raw1++;
+ *cook = (*raw0 & 0x00fc0000L) << 6;
+ *cook |= (*raw0 & 0x00000fc0L) << 10;
+ *cook |= (*raw1 & 0x00fc0000L) >> 10;
+ *cook++ |= (*raw1 & 0x00000fc0L) >> 6;
+ *cook = (*raw0 & 0x0003f000L) << 12;
+ *cook |= (*raw0 & 0x0000003fL) << 16;
+ *cook |= (*raw1 & 0x0003f000L) >> 4;
+ *cook++ |= (*raw1 & 0x0000003fL);
+ }
+ usekey(dough);
+ return;
+ }
+
+void cpkey(into)
+register unsigned long *into;
+{
+ register unsigned long *from, *endp;
+
+ from = KnL, endp = &KnL[32];
+ while( from < endp ) *into++ = *from++;
+ return;
+ }
+
+void usekey(from)
+register unsigned long *from;
+{
+ register unsigned long *to, *endp;
+
+ to = KnL, endp = &KnL[32];
+ while( to < endp ) *to++ = *from++;
+ return;
+ }
+
+void des(inblock, outblock)
+unsigned char *inblock, *outblock;
+{
+ unsigned long work[2];
+
+ scrunch(inblock, work);
+ desfunc(work, KnL);
+ unscrun(work, outblock);
+ return;
+ }
+
+static void scrunch(outof, into)
+register unsigned char *outof;
+register unsigned long *into;
+{
+ *into = (*outof++ & 0xffL) << 24;
+ *into |= (*outof++ & 0xffL) << 16;
+ *into |= (*outof++ & 0xffL) << 8;
+ *into++ |= (*outof++ & 0xffL);
+ *into = (*outof++ & 0xffL) << 24;
+ *into |= (*outof++ & 0xffL) << 16;
+ *into |= (*outof++ & 0xffL) << 8;
+ *into |= (*outof & 0xffL);
+ return;
+ }
+
+static void unscrun(outof, into)
+register unsigned long *outof;
+register unsigned char *into;
+{
+ *into++ = (unsigned char)((*outof >> 24) & 0xffL);
+ *into++ = (unsigned char)((*outof >> 16) & 0xffL);
+ *into++ = (unsigned char)((*outof >> 8) & 0xffL);
+ *into++ = (unsigned char)(*outof++ & 0xffL);
+ *into++ = (unsigned char)((*outof >> 24) & 0xffL);
+ *into++ = (unsigned char)((*outof >> 16) & 0xffL);
+ *into++ = (unsigned char)((*outof >> 8) & 0xffL);
+ *into = (unsigned char)(*outof & 0xffL);
+ return;
+ }
+
+static unsigned long SP1[64] = {
+ 0x01010400L, 0x00000000L, 0x00010000L, 0x01010404L,
+ 0x01010004L, 0x00010404L, 0x00000004L, 0x00010000L,
+ 0x00000400L, 0x01010400L, 0x01010404L, 0x00000400L,
+ 0x01000404L, 0x01010004L, 0x01000000L, 0x00000004L,
+ 0x00000404L, 0x01000400L, 0x01000400L, 0x00010400L,
+ 0x00010400L, 0x01010000L, 0x01010000L, 0x01000404L,
+ 0x00010004L, 0x01000004L, 0x01000004L, 0x00010004L,
+ 0x00000000L, 0x00000404L, 0x00010404L, 0x01000000L,
+ 0x00010000L, 0x01010404L, 0x00000004L, 0x01010000L,
+ 0x01010400L, 0x01000000L, 0x01000000L, 0x00000400L,
+ 0x01010004L, 0x00010000L, 0x00010400L, 0x01000004L,
+ 0x00000400L, 0x00000004L, 0x01000404L, 0x00010404L,
+ 0x01010404L, 0x00010004L, 0x01010000L, 0x01000404L,
+ 0x01000004L, 0x00000404L, 0x00010404L, 0x01010400L,
+ 0x00000404L, 0x01000400L, 0x01000400L, 0x00000000L,
+ 0x00010004L, 0x00010400L, 0x00000000L, 0x01010004L };
+
+static unsigned long SP2[64] = {
+ 0x80108020L, 0x80008000L, 0x00008000L, 0x00108020L,
+ 0x00100000L, 0x00000020L, 0x80100020L, 0x80008020L,
+ 0x80000020L, 0x80108020L, 0x80108000L, 0x80000000L,
+ 0x80008000L, 0x00100000L, 0x00000020L, 0x80100020L,
+ 0x00108000L, 0x00100020L, 0x80008020L, 0x00000000L,
+ 0x80000000L, 0x00008000L, 0x00108020L, 0x80100000L,
+ 0x00100020L, 0x80000020L, 0x00000000L, 0x00108000L,
+ 0x00008020L, 0x80108000L, 0x80100000L, 0x00008020L,
+ 0x00000000L, 0x00108020L, 0x80100020L, 0x00100000L,
+ 0x80008020L, 0x80100000L, 0x80108000L, 0x00008000L,
+ 0x80100000L, 0x80008000L, 0x00000020L, 0x80108020L,
+ 0x00108020L, 0x00000020L, 0x00008000L, 0x80000000L,
+ 0x00008020L, 0x80108000L, 0x00100000L, 0x80000020L,
+ 0x00100020L, 0x80008020L, 0x80000020L, 0x00100020L,
+ 0x00108000L, 0x00000000L, 0x80008000L, 0x00008020L,
+ 0x80000000L, 0x80100020L, 0x80108020L, 0x00108000L };
+
+static unsigned long SP3[64] = {
+ 0x00000208L, 0x08020200L, 0x00000000L, 0x08020008L,
+ 0x08000200L, 0x00000000L, 0x00020208L, 0x08000200L,
+ 0x00020008L, 0x08000008L, 0x08000008L, 0x00020000L,
+ 0x08020208L, 0x00020008L, 0x08020000L, 0x00000208L,
+ 0x08000000L, 0x00000008L, 0x08020200L, 0x00000200L,
+ 0x00020200L, 0x08020000L, 0x08020008L, 0x00020208L,
+ 0x08000208L, 0x00020200L, 0x00020000L, 0x08000208L,
+ 0x00000008L, 0x08020208L, 0x00000200L, 0x08000000L,
+ 0x08020200L, 0x08000000L, 0x00020008L, 0x00000208L,
+ 0x00020000L, 0x08020200L, 0x08000200L, 0x00000000L,
+ 0x00000200L, 0x00020008L, 0x08020208L, 0x08000200L,
+ 0x08000008L, 0x00000200L, 0x00000000L, 0x08020008L,
+ 0x08000208L, 0x00020000L, 0x08000000L, 0x08020208L,
+ 0x00000008L, 0x00020208L, 0x00020200L, 0x08000008L,
+ 0x08020000L, 0x08000208L, 0x00000208L, 0x08020000L,
+ 0x00020208L, 0x00000008L, 0x08020008L, 0x00020200L };
+
+static unsigned long SP4[64] = {
+ 0x00802001L, 0x00002081L, 0x00002081L, 0x00000080L,
+ 0x00802080L, 0x00800081L, 0x00800001L, 0x00002001L,
+ 0x00000000L, 0x00802000L, 0x00802000L, 0x00802081L,
+ 0x00000081L, 0x00000000L, 0x00800080L, 0x00800001L,
+ 0x00000001L, 0x00002000L, 0x00800000L, 0x00802001L,
+ 0x00000080L, 0x00800000L, 0x00002001L, 0x00002080L,
+ 0x00800081L, 0x00000001L, 0x00002080L, 0x00800080L,
+ 0x00002000L, 0x00802080L, 0x00802081L, 0x00000081L,
+ 0x00800080L, 0x00800001L, 0x00802000L, 0x00802081L,
+ 0x00000081L, 0x00000000L, 0x00000000L, 0x00802000L,
+ 0x00002080L, 0x00800080L, 0x00800081L, 0x00000001L,
+ 0x00802001L, 0x00002081L, 0x00002081L, 0x00000080L,
+ 0x00802081L, 0x00000081L, 0x00000001L, 0x00002000L,
+ 0x00800001L, 0x00002001L, 0x00802080L, 0x00800081L,
+ 0x00002001L, 0x00002080L, 0x00800000L, 0x00802001L,
+ 0x00000080L, 0x00800000L, 0x00002000L, 0x00802080L };
+
+static unsigned long SP5[64] = {
+ 0x00000100L, 0x02080100L, 0x02080000L, 0x42000100L,
+ 0x00080000L, 0x00000100L, 0x40000000L, 0x02080000L,
+ 0x40080100L, 0x00080000L, 0x02000100L, 0x40080100L,
+ 0x42000100L, 0x42080000L, 0x00080100L, 0x40000000L,
+ 0x02000000L, 0x40080000L, 0x40080000L, 0x00000000L,
+ 0x40000100L, 0x42080100L, 0x42080100L, 0x02000100L,
+ 0x42080000L, 0x40000100L, 0x00000000L, 0x42000000L,
+ 0x02080100L, 0x02000000L, 0x42000000L, 0x00080100L,
+ 0x00080000L, 0x42000100L, 0x00000100L, 0x02000000L,
+ 0x40000000L, 0x02080000L, 0x42000100L, 0x40080100L,
+ 0x02000100L, 0x40000000L, 0x42080000L, 0x02080100L,
+ 0x40080100L, 0x00000100L, 0x02000000L, 0x42080000L,
+ 0x42080100L, 0x00080100L, 0x42000000L, 0x42080100L,
+ 0x02080000L, 0x00000000L, 0x40080000L, 0x42000000L,
+ 0x00080100L, 0x02000100L, 0x40000100L, 0x00080000L,
+ 0x00000000L, 0x40080000L, 0x02080100L, 0x40000100L };
+
+static unsigned long SP6[64] = {
+ 0x20000010L, 0x20400000L, 0x00004000L, 0x20404010L,
+ 0x20400000L, 0x00000010L, 0x20404010L, 0x00400000L,
+ 0x20004000L, 0x00404010L, 0x00400000L, 0x20000010L,
+ 0x00400010L, 0x20004000L, 0x20000000L, 0x00004010L,
+ 0x00000000L, 0x00400010L, 0x20004010L, 0x00004000L,
+ 0x00404000L, 0x20004010L, 0x00000010L, 0x20400010L,
+ 0x20400010L, 0x00000000L, 0x00404010L, 0x20404000L,
+ 0x00004010L, 0x00404000L, 0x20404000L, 0x20000000L,
+ 0x20004000L, 0x00000010L, 0x20400010L, 0x00404000L,
+ 0x20404010L, 0x00400000L, 0x00004010L, 0x20000010L,
+ 0x00400000L, 0x20004000L, 0x20000000L, 0x00004010L,
+ 0x20000010L, 0x20404010L, 0x00404000L, 0x20400000L,
+ 0x00404010L, 0x20404000L, 0x00000000L, 0x20400010L,
+ 0x00000010L, 0x00004000L, 0x20400000L, 0x00404010L,
+ 0x00004000L, 0x00400010L, 0x20004010L, 0x00000000L,
+ 0x20404000L, 0x20000000L, 0x00400010L, 0x20004010L };
+
+static unsigned long SP7[64] = {
+ 0x00200000L, 0x04200002L, 0x04000802L, 0x00000000L,
+ 0x00000800L, 0x04000802L, 0x00200802L, 0x04200800L,
+ 0x04200802L, 0x00200000L, 0x00000000L, 0x04000002L,
+ 0x00000002L, 0x04000000L, 0x04200002L, 0x00000802L,
+ 0x04000800L, 0x00200802L, 0x00200002L, 0x04000800L,
+ 0x04000002L, 0x04200000L, 0x04200800L, 0x00200002L,
+ 0x04200000L, 0x00000800L, 0x00000802L, 0x04200802L,
+ 0x00200800L, 0x00000002L, 0x04000000L, 0x00200800L,
+ 0x04000000L, 0x00200800L, 0x00200000L, 0x04000802L,
+ 0x04000802L, 0x04200002L, 0x04200002L, 0x00000002L,
+ 0x00200002L, 0x04000000L, 0x04000800L, 0x00200000L,
+ 0x04200800L, 0x00000802L, 0x00200802L, 0x04200800L,
+ 0x00000802L, 0x04000002L, 0x04200802L, 0x04200000L,
+ 0x00200800L, 0x00000000L, 0x00000002L, 0x04200802L,
+ 0x00000000L, 0x00200802L, 0x04200000L, 0x00000800L,
+ 0x04000002L, 0x04000800L, 0x00000800L, 0x00200002L };
+
+static unsigned long SP8[64] = {
+ 0x10001040L, 0x00001000L, 0x00040000L, 0x10041040L,
+ 0x10000000L, 0x10001040L, 0x00000040L, 0x10000000L,
+ 0x00040040L, 0x10040000L, 0x10041040L, 0x00041000L,
+ 0x10041000L, 0x00041040L, 0x00001000L, 0x00000040L,
+ 0x10040000L, 0x10000040L, 0x10001000L, 0x00001040L,
+ 0x00041000L, 0x00040040L, 0x10040040L, 0x10041000L,
+ 0x00001040L, 0x00000000L, 0x00000000L, 0x10040040L,
+ 0x10000040L, 0x10001000L, 0x00041040L, 0x00040000L,
+ 0x00041040L, 0x00040000L, 0x10041000L, 0x00001000L,
+ 0x00000040L, 0x10040040L, 0x00001000L, 0x00041040L,
+ 0x10001000L, 0x00000040L, 0x10000040L, 0x10040000L,
+ 0x10040040L, 0x10000000L, 0x00040000L, 0x10001040L,
+ 0x00000000L, 0x10041040L, 0x00040040L, 0x10000040L,
+ 0x10040000L, 0x10001000L, 0x10001040L, 0x00000000L,
+ 0x10041040L, 0x00041000L, 0x00041000L, 0x00001040L,
+ 0x00001040L, 0x00040040L, 0x10000000L, 0x10041000L };
+
+static void desfunc(block, keys)
+register unsigned long *block, *keys;
+{
+ register unsigned long fval, work, right, leftt;
+ register int round;
+
+ leftt = block[0];
+ right = block[1];
+ work = ((leftt >> 4) ^ right) & 0x0f0f0f0fL;
+ right ^= work;
+ leftt ^= (work << 4);
+ work = ((leftt >> 16) ^ right) & 0x0000ffffL;
+ right ^= work;
+ leftt ^= (work << 16);
+ work = ((right >> 2) ^ leftt) & 0x33333333L;
+ leftt ^= work;
+ right ^= (work << 2);
+ work = ((right >> 8) ^ leftt) & 0x00ff00ffL;
+ leftt ^= work;
+ right ^= (work << 8);
+ right = ((right << 1) | ((right >> 31) & 1L)) & 0xffffffffL;
+ work = (leftt ^ right) & 0xaaaaaaaaL;
+ leftt ^= work;
+ right ^= work;
+ leftt = ((leftt << 1) | ((leftt >> 31) & 1L)) & 0xffffffffL;
+
+ for( round = 0; round < 8; round++ ) {
+ work = (right << 28) | (right >> 4);
+ work ^= *keys++;
+ fval = SP7[ work & 0x3fL];
+ fval |= SP5[(work >> 8) & 0x3fL];
+ fval |= SP3[(work >> 16) & 0x3fL];
+ fval |= SP1[(work >> 24) & 0x3fL];
+ work = right ^ *keys++;
+ fval |= SP8[ work & 0x3fL];
+ fval |= SP6[(work >> 8) & 0x3fL];
+ fval |= SP4[(work >> 16) & 0x3fL];
+ fval |= SP2[(work >> 24) & 0x3fL];
+ leftt ^= fval;
+ work = (leftt << 28) | (leftt >> 4);
+ work ^= *keys++;
+ fval = SP7[ work & 0x3fL];
+ fval |= SP5[(work >> 8) & 0x3fL];
+ fval |= SP3[(work >> 16) & 0x3fL];
+ fval |= SP1[(work >> 24) & 0x3fL];
+ work = leftt ^ *keys++;
+ fval |= SP8[ work & 0x3fL];
+ fval |= SP6[(work >> 8) & 0x3fL];
+ fval |= SP4[(work >> 16) & 0x3fL];
+ fval |= SP2[(work >> 24) & 0x3fL];
+ right ^= fval;
+ }
+
+ right = (right << 31) | (right >> 1);
+ work = (leftt ^ right) & 0xaaaaaaaaL;
+ leftt ^= work;
+ right ^= work;
+ leftt = (leftt << 31) | (leftt >> 1);
+ work = ((leftt >> 8) ^ right) & 0x00ff00ffL;
+ right ^= work;
+ leftt ^= (work << 8);
+ work = ((leftt >> 2) ^ right) & 0x33333333L;
+ right ^= work;
+ leftt ^= (work << 2);
+ work = ((right >> 16) ^ leftt) & 0x0000ffffL;
+ leftt ^= work;
+ right ^= (work << 16);
+ work = ((right >> 4) ^ leftt) & 0x0f0f0f0fL;
+ leftt ^= work;
+ right ^= (work << 4);
+ *block++ = right;
+ *block = leftt;
+ return;
+ }
+
+/* Validation sets:
+ *
+ * Single-length key, single-length plaintext -
+ * Key : 0123 4567 89ab cdef
+ * Plain : 0123 4567 89ab cde7
+ * Cipher : c957 4425 6a5e d31d
+ *
+ * Double-length key, single-length plaintext -
+ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210
+ * Plain : 0123 4567 89ab cde7
+ * Cipher : 7f1d 0a77 826b 8aff
+ *
+ * Double-length key, double-length plaintext -
+ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210
+ * Plain : 0123 4567 89ab cdef 0123 4567 89ab cdff
+ * Cipher : 27a0 8440 406a df60 278f 47cf 42d6 15d7
+ *
+ * Triple-length key, single-length plaintext -
+ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 89ab cdef 0123 4567
+ * Plain : 0123 4567 89ab cde7
+ * Cipher : de0b 7c06 ae5e 0ed5
+ *
+ * Triple-length key, double-length plaintext -
+ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 89ab cdef 0123 4567
+ * Plain : 0123 4567 89ab cdef 0123 4567 89ab cdff
+ * Cipher : ad0d 1b30 ac17 cf07 0ed1 1c63 81e4 4de5
+ *
+ * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
+ **********************************************************************/
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/d3des.h xen-3.0.3_0-src.new/tools/ioemu/d3des.h
--- xen-3.0.3_0-src.orig/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
+++ xen-3.0.3_0-src.new/tools/ioemu/d3des.h 2006-10-19 11:28:49.000000000 -0400
@@ -0,0 +1,51 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
+ * triple-length support removed for use in VNC.
+ *
+ * These changes are:
+ * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+ *
+ * This software 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.
+ */
+
+/* d3des.h -
+ *
+ * Headers and defines for d3des.c
+ * Graven Imagery, 1992.
+ *
+ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
+ * (GEnie : OUTER; CIS : [71755,204])
+ */
+
+#define EN0 0 /* MODE == encrypt */
+#define DE1 1 /* MODE == decrypt */
+
+extern void deskey(unsigned char *, int);
+/* hexkey[8] MODE
+ * Sets the internal key register according to the hexadecimal
+ * key contained in the 8 bytes of hexkey, according to the DES,
+ * for encryption or decryption according to MODE.
+ */
+
+extern void usekey(unsigned long *);
+/* cookedkey[32]
+ * Loads the internal key register with the data in cookedkey.
+ */
+
+extern void cpkey(unsigned long *);
+/* cookedkey[32]
+ * Copies the contents of the internal key register into the storage
+ * located at &cookedkey[0].
+ */
+
+extern void des(unsigned char *, unsigned char *);
+/* from[8] to[8]
+ * Encrypts/Decrypts (according to the key currently loaded in the
+ * internal key register) one block of eight bytes at address 'from'
+ * into the block at address 'to'. They can be the same.
+ */
+
+/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
+ ********************************************************************/
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/Makefile.target xen-3.0.3_0-src.new/tools/ioemu/Makefile.target
--- xen-3.0.3_0-src.orig/tools/ioemu/Makefile.target 2006-10-19 11:28:25.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/ioemu/Makefile.target 2006-10-19 11:28:49.000000000 -0400
@@ -398,6 +398,7 @@
VL_OBJS+=sdl.o
endif
VL_OBJS+=vnc.o
+VL_OBJS+=d3des.o
ifdef CONFIG_COCOA
VL_OBJS+=cocoa.o
COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
@@ -458,6 +459,9 @@
vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+d3des.o: d3des.c d3des.h
+ $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+
sdlaudio.o: sdlaudio.c
$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/vl.c xen-3.0.3_0-src.new/tools/ioemu/vl.c
--- xen-3.0.3_0-src.orig/tools/ioemu/vl.c 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/ioemu/vl.c 2006-10-19 11:28:50.000000000 -0400
@@ -171,6 +171,9 @@
char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
extern int domid;
+char vncpasswd[64];
+unsigned char challenge[AUTHCHALLENGESIZE];
+
/***********************************************************/
/* x86 ISA bus support */
@@ -5911,6 +5914,7 @@
vncunused = 0;
kernel_filename = NULL;
kernel_cmdline = "";
+ *vncpasswd = '\0';
#ifndef CONFIG_DM
#ifdef TARGET_PPC
cdrom_index = 1;
@@ -6559,6 +6563,10 @@
init_ioports();
+ /* read vncpasswd from xenstore */
+ if (0 > xenstore_read_vncpasswd(domid))
+ exit(1);
+
/* terminal init */
if (nographic) {
dumb_display_init(ds);
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/vl.h xen-3.0.3_0-src.new/tools/ioemu/vl.h
--- xen-3.0.3_0-src.orig/tools/ioemu/vl.h 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/ioemu/vl.h 2006-10-19 11:28:50.000000000 -0400
@@ -1211,6 +1211,7 @@
void xenstore_process_event(void *opaque);
void xenstore_check_new_media_present(int timeout);
void xenstore_write_vncport(int vnc_display);
+int xenstore_read_vncpasswd(int domid);
/* xen_platform.c */
void pci_xen_platform_init(PCIBus *bus);
@@ -1222,4 +1223,7 @@
void destroy_hvm_domain(void);
+/* VNC Authentication */
+#define AUTHCHALLENGESIZE 16
+
#endif /* VL_H */
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/vnc.c xen-3.0.3_0-src.new/tools/ioemu/vnc.c
--- xen-3.0.3_0-src.orig/tools/ioemu/vnc.c 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/ioemu/vnc.c 2006-10-19 11:28:50.000000000 -0400
@@ -44,6 +44,7 @@
#include "vnc_keysym.h"
#include "keymaps.c"
+#include "d3des.h"
#define XK_MISCELLANY
#define XK_LATIN1
@@ -137,6 +138,9 @@
static void vnc_update_client(void *opaque);
static void vnc_client_read(void *opaque);
static void framebuffer_set_updated(VncState *vs, int x, int y, int w, int h);
+static int make_challenge(char *random, int size);
+static void set_seed(unsigned int *seedp);
+static void get_random(int len, unsigned char *buf);
#if 0
static inline void vnc_set_bit(uint32_t *d, int k)
@@ -1208,23 +1212,92 @@
return 0;
}
+static int protocol_response(VncState *vs, char *client_response, size_t len)
+{
+ extern char vncpasswd[64];
+ extern unsigned char challenge[AUTHCHALLENGESIZE];
+ unsigned char cryptchallenge[AUTHCHALLENGESIZE];
+ unsigned char key[8];
+ int passwdlen, i, j;
+
+ memcpy(cryptchallenge, challenge, AUTHCHALLENGESIZE);
+
+ /* Calculate the sent challenge */
+ passwdlen = strlen(vncpasswd);
+ for (i=0; i<8; i++)
+ key[i] = i<passwdlen ? vncpasswd[i] : 0;
+ deskey(key, EN0);
+ for (j = 0; j < AUTHCHALLENGESIZE; j += 8)
+ des(cryptchallenge+j, cryptchallenge+j);
+
+ /* Check the actual response */
+ if (memcmp(cryptchallenge, client_response, AUTHCHALLENGESIZE) != 0) {
+ /* password error */
+ vnc_write_u32(vs, 1);
+ vnc_write_u32(vs, 22);
+ vnc_write(vs, "Authentication failure", 22);
+ vnc_flush(vs);
+ fprintf(stderr, "VNC Password error.\n");
+ vnc_client_error(vs);
+ return 0;
+ }
+
+ vnc_write_u32(vs, 0);
+ vnc_flush(vs);
+
+ vnc_read_when(vs, protocol_client_init, 1);
+
+ return 0;
+}
+
static int protocol_version(VncState *vs, char *version, size_t len)
{
+ extern char vncpasswd[64];
+ extern unsigned char challenge[AUTHCHALLENGESIZE];
char local[13];
- int maj, min;
+ int support, maj, min;
memcpy(local, version, 12);
local[12] = 0;
+ /* protocol version check */
if (sscanf(local, "RFB %03d.%03d\n", &maj, &min) != 2) {
+ fprintf(stderr, "Protocol version error.\n");
vnc_client_error(vs);
return 0;
}
- vnc_write_u32(vs, 1); /* None */
- vnc_flush(vs);
- vnc_read_when(vs, protocol_client_init, 1);
+ support = 0;
+ if (maj = 3) {
+ if (min == 3 || min ==4) {
+ support = 1;
+ }
+ }
+
+ if (! support) {
+ fprintf(stderr, "Client uses unsupported protocol version %d.%d.\n",
+ maj, min);
+ vnc_client_error(vs);
+ return 0;
+ }
+
+ if (*vncpasswd == '\0') {
+ /* AuthType is None */
+ vnc_write_u32(vs, 1);
+ vnc_flush(vs);
+ vnc_read_when(vs, protocol_client_init, 1);
+ } else {
+ /* AuthType is VncAuth */
+ vnc_write_u32(vs, 2);
+
+ /* Challenge-Responce authentication */
+ /* Send Challenge */
+ make_challenge(challenge, AUTHCHALLENGESIZE);
+ vnc_write(vs, challenge, AUTHCHALLENGESIZE);
+ vnc_flush(vs);
+ vnc_read_when(vs, protocol_response, AUTHCHALLENGESIZE);
+ }
return 0;
}
@@ -1342,3 +1415,32 @@
return pid;
}
}
+
+unsigned int seed;
+
+static int make_challenge(char *random, int size)
+{
+
+ set_seed(&seed);
+ get_random(size, random);
+
+ return 0;
+}
+
+static void set_seed(unsigned int *seedp)
+{
+ *seedp += (unsigned int)(time(NULL)+getpid()+getpid()*987654+rand());
+ srand(*seedp);
+
+ return;
+}
+
+static void get_random(int len, unsigned char *buf)
+{
+ int i;
+
+ for (i=0; i<len; i++)
+ buf[i] = (int) (256.0*rand()/(RAND_MAX+1.0));
+
+ return;
+}
diff -ruN xen-3.0.3_0-src.orig/tools/ioemu/xenstore.c xen-3.0.3_0-src.new/tools/ioemu/xenstore.c
--- xen-3.0.3_0-src.orig/tools/ioemu/xenstore.c 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/ioemu/xenstore.c 2006-10-19 11:28:50.000000000 -0400
@@ -213,3 +213,54 @@
free(portstr);
free(buf);
}
+
+int xenstore_read_vncpasswd(int domid)
+{
+ extern char vncpasswd[64];
+ char *buf = NULL, *path, *uuid = NULL, *passwd = NULL;
+ unsigned int i, len, rc = 0;
+
+ if (xsh == NULL) {
+ return -1;
+ }
+
+ path = xs_get_domain_path(xsh, domid);
+ if (path == NULL) {
+ fprintf(logfile, "xs_get_domain_path() error. domid %d.\n", domid);
+ return -1;
+ }
+
+ pasprintf(&buf, "%s/vm", path);
+ uuid = xs_read(xsh, XBT_NULL, buf, &len);
+ if (uuid == NULL) {
+ fprintf(logfile, "xs_read(): uuid get error. %s.\n", buf);
+ free(path);
+ return -1;
+ }
+
+ pasprintf(&buf, "%s/vncpasswd", uuid);
+ passwd = xs_read(xsh, XBT_NULL, buf, &len);
+ if (passwd == NULL) {
+ fprintf(logfile, "xs_read(): vncpasswd get error. %s.\n", buf);
+ free(uuid);
+ free(path);
+ return rc;
+ }
+
+ for (i=0; i<len && i<63; i++) {
+ vncpasswd[i] = passwd[i];
+ passwd[i] = '\0';
+ }
+ vncpasswd[len] = '\0';
+ pasprintf(&buf, "%s/vncpasswd", uuid);
+ if (xs_write(xsh, XBT_NULL, buf, passwd, len) == 0) {
+ fprintf(logfile, "xs_write() vncpasswd failed.\n");
+ rc = -1;
+ }
+
+ free(passwd);
+ free(uuid);
+ free(path);
+
+ return rc;
+}
diff -ruN xen-3.0.3_0-src.orig/tools/python/xen/xend/image.py xen-3.0.3_0-src.new/tools/python/xen/xend/image.py
--- xen-3.0.3_0-src.orig/tools/python/xen/xend/image.py 2006-10-19 11:28:25.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/python/xen/xend/image.py 2006-10-19 11:28:50.000000000 -0400
@@ -418,8 +418,16 @@
sdl = sxp.child_value(config, 'sdl')
ret = []
nographic = sxp.child_value(config, 'nographic')
+
+ # get password from VM config(if password omitted, None)
+ vncpasswd_vmconfig = sxp.child_value(config, 'vncpasswd')
+ vncpasswd = vncpasswd_vmconfig
+
if nographic:
ret.append('-nographic')
+ # remove password
+ if vncpasswd_vmconfig:
+ config.remove(['vncpasswd', vncpasswd_vmconfig])
return ret
if vnc:
vncdisplay = sxp.child_value(config, 'vncdisplay',
@@ -435,6 +443,20 @@
vnclisten = xen.xend.XendRoot.instance().get_vnclisten_address()
if vnclisten:
ret += ['-vnclisten', vnclisten]
+ # get password from xend-config(if password omitted, None)
+ vncpasswd_default = xen.xend.XendRoot.instance().get_vncpasswd_default()
+ # password check
+ if vncpasswd is None:
+ if vncpasswd_default is None:
+ raise VmError('vncpasswd is not setuped in VMconfig and xend-config.')
+ else:
+ vncpasswd = vncpasswd_default
+ if vncpasswd!='':
+ self.vm.storeVm("vncpasswd", vncpasswd)
+
+ # remove password
+ config.remove(['vncpasswd', vncpasswd_vmconfig])
+
return ret
def createDeviceModel(self):
diff -ruN xen-3.0.3_0-src.orig/tools/python/xen/xend/XendRoot.py xen-3.0.3_0-src.new/tools/python/xen/xend/XendRoot.py
--- xen-3.0.3_0-src.orig/tools/python/xen/xend/XendRoot.py 2006-10-15 08:22:03.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/python/xen/xend/XendRoot.py 2006-10-19 11:28:50.000000000 -0400
@@ -96,6 +96,8 @@
dom0_vcpus_default = '0'
+ vncpasswd_default = None
+
"""Default interface to listen for VNC connections on"""
xend_vnc_listen_default = '127.0.0.1'
@@ -278,6 +280,10 @@
def get_vnclisten_address(self):
return self.get_config_value('vnc-listen', self.xend_vnc_listen_default)
+ def get_vncpasswd_default(self):
+ return self.get_config_value('vncpasswd',
+ self.vncpasswd_default)
+
def instance():
"""Get an instance of XendRoot.
Use this instead of the constructor.
diff -ruN xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py xen-3.0.3_0-src.new/tools/python/xen/xm/create.py
--- xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py 2006-10-19 11:28:25.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/python/xen/xm/create.py 2006-10-19 11:28:50.000000000 -0400
@@ -104,6 +104,10 @@
fn=set_true, default=0,
use="Connect to the console after the domain is created.")
+gopts.var('vncpasswd', val='NAME',
+ fn=set_value, default=None,
+ use="Password for VNC console on HVM domain.")
+
gopts.var('vncviewer', val='no|yes',
fn=set_bool, default=None,
use="Spawn a vncviewer listening for a vnc server in the domain.\n"
@@ -652,6 +656,7 @@
for a in args:
if (vals.__dict__[a]):
config_image.append([a, vals.__dict__[a]])
+ config_image.append(['vncpasswd', vals.vncpasswd])
def run_bootloader(vals, config_image):
if not os.access(vals.bootloader, os.X_OK):
xen-vncpassword-pvfb-2.patch:
python/xen/xend/image.py | 39 +++++++++++-------
python/xen/xm/create.py | 3 -
xenfb/vncfb.c | 101 ++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 114 insertions(+), 29 deletions(-)
--- NEW FILE xen-vncpassword-pvfb-2.patch ---
diff -ruN xen-3.0.3_0-src.orig/tools/python/xen/xend/image.py xen-3.0.3_0-src.new/tools/python/xen/xend/image.py
--- xen-3.0.3_0-src.orig/tools/python/xen/xend/image.py 2006-10-19 11:34:30.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/python/xen/xend/image.py 2006-10-19 11:34:36.000000000 -0400
@@ -219,6 +219,11 @@
self.display = sxp.child_value(imageConfig, 'display')
self.xauthority = sxp.child_value(imageConfig, 'xauthority')
self.vncconsole = sxp.child_value(imageConfig, 'vncconsole')
+ vncpasswd = sxp.child_value(imageConfig, 'vncpasswd')
+ if not(vncpasswd is None):
+ imageConfig.remove(['vncpasswd', vncpasswd])
+ self.vncpasswd = vncpasswd
+
self.vnc = sxp.child_value(imageConfig, 'vnc')
self.sdl = sxp.child_value(imageConfig, 'sdl')
if self.vnc:
@@ -249,10 +254,23 @@
args += [ "--vncport", "%d" %(5900 + self.vncdisplay,) ]
if self.vnclisten:
args += [ "--listen", self.vnclisten ]
+
+ # password check
+ if self.vncpasswd is None:
+ # get password from xend-config(if password omitted, None)
+ self.vncpasswd = xen.xend.XendRoot.instance().get_vncpasswd_default()
+
+ if self.vncpasswd is None:
+ raise VmError('vncpasswd is not setup in the guest config or xend-config.')
+ if self.vncpasswd != '':
+ self.vm.storeVm("vncpasswd", self.vncpasswd)
+ log.info("vncpassword set to '%s'", self.vncpasswd)
+
elif self.sdl:
args = [xen.util.auxbin.pathTo("xen-sdlfb")]
args = args + [ "--domid", "%d" % self.vm.getDomid(),
"--title", self.vm.info['name'] ]
+
env = dict(os.environ)
if self.display:
env['DISPLAY'] = self.display
@@ -420,14 +438,12 @@
nographic = sxp.child_value(config, 'nographic')
# get password from VM config(if password omitted, None)
- vncpasswd_vmconfig = sxp.child_value(config, 'vncpasswd')
- vncpasswd = vncpasswd_vmconfig
+ vncpasswd = sxp.child_value(config, 'vncpasswd')
+ if not(vncpasswd is None):
+ config.remove(['vncpasswd', vncpasswd])
if nographic:
ret.append('-nographic')
- # remove password
- if vncpasswd_vmconfig:
- config.remove(['vncpasswd', vncpasswd_vmconfig])
return ret
if vnc:
vncdisplay = sxp.child_value(config, 'vncdisplay',
@@ -443,20 +459,15 @@
vnclisten = xen.xend.XendRoot.instance().get_vnclisten_address()
if vnclisten:
ret += ['-vnclisten', vnclisten]
- # get password from xend-config(if password omitted, None)
- vncpasswd_default = xen.xend.XendRoot.instance().get_vncpasswd_default()
# password check
if vncpasswd is None:
- if vncpasswd_default is None:
+ # get password from xend-config(if password omitted, None)
+ vncpasswd = xen.xend.XendRoot.instance().get_vncpasswd_default()
+ if vncpasswd is None:
raise VmError('vncpasswd is not setuped in VMconfig and xend-config.')
- else:
- vncpasswd = vncpasswd_default
- if vncpasswd!='':
+ if vncpasswd != '':
self.vm.storeVm("vncpasswd", vncpasswd)
- # remove password
- config.remove(['vncpasswd', vncpasswd_vmconfig])
-
return ret
def createDeviceModel(self):
diff -ruN xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py xen-3.0.3_0-src.new/tools/python/xen/xm/create.py
--- xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py 2006-10-19 11:34:30.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/python/xen/xm/create.py 2006-10-19 11:35:47.000000000 -0400
@@ -642,7 +642,7 @@
"""Create the config for graphic consoles.
"""
args = [ 'vnc', 'vncdisplay', 'vncconsole', 'vncunused',
- 'sdl', 'display', 'xauthority', 'vnclisten' ]
+ 'sdl', 'display', 'xauthority', 'vnclisten', 'vncpasswd']
for a in args:
if (vals.__dict__[a]):
config_image.append([a, vals.__dict__[a]])
@@ -656,7 +656,6 @@
for a in args:
if (vals.__dict__[a]):
config_image.append([a, vals.__dict__[a]])
- config_image.append(['vncpasswd', vals.vncpasswd])
def run_bootloader(vals, config_image):
if not os.access(vals.bootloader, os.X_OK):
diff -ruN xen-3.0.3_0-src.orig/tools/xenfb/vncfb.c xen-3.0.3_0-src.new/tools/xenfb/vncfb.c
--- xen-3.0.3_0-src.orig/tools/xenfb/vncfb.c 2006-10-19 11:28:25.000000000 -0400
+++ xen-3.0.3_0-src.new/tools/xenfb/vncfb.c 2006-10-19 11:34:36.000000000 -0400
@@ -45,15 +45,10 @@
last_y = y;
}
-static void xenstore_write_vncport(int port, int domid)
+static void xenstore_write_vncport(struct xs_handle *xsh, int port, int domid)
{
- char *buf = NULL, *path;
+ char buf[256], *path;
char *portstr = NULL;
- struct xs_handle *xsh = NULL;
-
- xsh = xs_daemon_open();
- if (xsh == NULL)
- return;
path = xs_get_domain_path(xsh, domid);
if (path == NULL) {
@@ -61,7 +56,6 @@
goto out;
}
- buf = malloc(256);
if (snprintf(buf, 256, "%s/console/vnc-port", path) == -1)
goto out;
@@ -74,7 +68,56 @@
out:
free(portstr);
- free(buf);
+}
+
+static int xenstore_read_vncpasswd(struct xs_handle *xsh, int domid, char *pwbuf, int pwbuflen)
+{
+ char buf[256], *path, *uuid = NULL, *passwd = NULL;
+ unsigned int i, len, rc = 0;
+
+ if (xsh == NULL) {
+ return -1;
+ }
+
+ path = xs_get_domain_path(xsh, domid);
+ if (path == NULL) {
+ fprintf(stderr, "xs_get_domain_path() error\n");
+ return -1;
+ }
+
+ snprintf(buf, 256, "%s/vm", path);
+ uuid = xs_read(xsh, XBT_NULL, buf, &len);
+ if (uuid == NULL) {
+ fprintf(stderr, "xs_read(): uuid get error\n");
+ free(path);
+ return -1;
+ }
+
+ snprintf(buf, 256, "%s/vncpasswd", uuid);
+ passwd = xs_read(xsh, XBT_NULL, buf, &len);
+ if (passwd == NULL) {
+ free(uuid);
+ free(path);
+ return rc;
+ }
+
+ strncpy(pwbuf, passwd, pwbuflen-1);
+ pwbuf[pwbuflen-1] = '\0';
+
+ fprintf(stderr, "VNC password read from XS '%s'\n", pwbuf);
+
+ passwd[0] = '\0';
+ snprintf(buf, 256, "%s/vncpasswd", uuid);
+ if (xs_write(xsh, XBT_NULL, buf, passwd, len) == 0) {
+ fprintf(stderr, "xs_write() vncpasswd failed\n");
+ rc = -1;
+ }
+
+ free(passwd);
+ free(uuid);
+ free(path);
+
+ return rc;
}
@@ -95,8 +138,8 @@
int main(int argc, char **argv)
{
rfbScreenInfoPtr server;
- char *fake_argv[7] = { "vncfb", "-rfbport", "5901",
- "-desktop", "xen-vncfb",
+ char *fake_argv[7] = { "vncfb", "-rfbport", "5901",
+ "-desktop", "xen-vncfb",
"-listen", "0.0.0.0" };
int fake_argc = sizeof(fake_argv) / sizeof(fake_argv[0]);
int domid = -1, port = -1;
@@ -108,6 +151,10 @@
char buffer[1024];
int opt;
bool unused = FALSE;
+ struct xs_handle *xsh;
+ char vncpasswd[1024];
+
+ vncpasswd[0] = '\0';
while ((opt = getopt_long(argc, argv, "d:p:t:u", options,
NULL)) != -1) {
@@ -137,7 +184,7 @@
fprintf(stderr, "Domain ID must be specified!\n");
exit(1);
}
-
+
if (port == -1)
port = 5900 + domid;
snprintf(buffer, sizeof(buffer), "%d", port);
@@ -164,6 +211,19 @@
exit(1);
}
+ xsh = xs_daemon_open();
+ if (xsh == NULL) {
+ fprintf(stderr, "cannot open connection to xenstore\n");
+ exit(1);
+ }
+
+
+ if (xenstore_read_vncpasswd(xsh, domid, vncpasswd, sizeof(vncpasswd)/sizeof(char)) < 0) {
+ fprintf(stderr, "cannot read VNC password from xenstore\n");
+ exit(1);
+ }
+
+
server = rfbGetScreen(&fake_argc, fake_argv,
xenfb->width, xenfb->height,
8, 3, xenfb->depth / 8);
@@ -178,6 +238,21 @@
if (unused)
server->autoPort = TRUE;
+ if (vncpasswd[0]) {
+ char **passwds = malloc(sizeof(char**)*2);
+ if (!passwds) {
+ fprintf(stderr, "cannot allocate memory (%s)\n", strerror(errno));
+ exit(1);
+ }
+ fprintf(stderr, "Activated password '%s'\n", vncpasswd);
+ passwds[0] = vncpasswd;
+ passwds[1] = NULL;
+
+ server->authPasswdData = passwds;
+ server->passwordCheck = rfbCheckPasswordByList;
+ } else {
+ fprintf(stderr, "Running with no password\n");
+ }
server->serverFormat.redShift = 16;
server->serverFormat.greenShift = 8;
server->serverFormat.blueShift = 0;
@@ -195,7 +270,7 @@
FD_ZERO(&readfds);
FD_SET(fd, &readfds);
- xenstore_write_vncport(server->port, domid);
+ xenstore_write_vncport(xsh, server->port, domid);
while (select(fd + 1, &readfds, NULL, NULL, NULL) != -1) {
if (FD_ISSET(fd, &readfds)) {
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 17 Oct 2006 17:17:59 -0000 1.27
+++ .cvsignore 14 Nov 2006 19:27:29 -0000 1.28
@@ -1,2 +1,2 @@
LibVNCServer-0.8.2.tar.gz
-xen-3.0.3-rc3.tar.bz2
+xen-3.0.3_0-src.tgz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-6/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 17 Oct 2006 17:17:59 -0000 1.42
+++ sources 14 Nov 2006 19:27:29 -0000 1.43
@@ -1,2 +1,2 @@
17a18e398af6c1730f72068022a152aa LibVNCServer-0.8.2.tar.gz
-14cc50ce089953d42c56142ddabfdb4a xen-3.0.3-rc3.tar.bz2
+75d895858a467405114599abf94d60a2 xen-3.0.3_0-src.tgz
Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-6/xen.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- xen.spec 17 Oct 2006 17:17:59 -0000 1.157
+++ xen.spec 14 Nov 2006 19:27:29 -0000 1.158
@@ -1,24 +1,24 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define upstream rc3
-
Summary: Xen is a virtual machine monitor
Name: xen
Version: 3.0.3
-Release: 0.1.rc3
+Release: 1%{dist}
Group: Development/Libraries
License: GPL
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-3.0.3-%{upstream}.tar.bz2
+Source0: http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/xen-3.0.3_0-src.tgz
Source1: http://download.sf.net/libvncserver/LibVNCServer-0.8.2.tar.gz
Patch1: xen-initscript.patch
Patch2: xen-nostrip-ioemu.patch
Patch3: xen-compile-fixes.patch
Patch6: xen-network-iptables-bridge.patch
Patch8: xen-vmxballoon-hack.patch
-Patch9: xen-revert-gzip.patch
+Patch9: xen-logfile-O_APPEND.patch
+Patch10: xen-uptime-device.patch
+Patch11: xen-print-fullpath.patch
+Patch12: xen-vmxassist-load16.patch
Patch20: xen-blktap-no-aio-epoll.patch
-Patch21: xen-blktap-patches.patch
# Patches to modify the default config of xend
Patch100: xen-config-dom0-minmem.patch
@@ -30,10 +30,13 @@
Patch201: xen-pvfb-nocursor.patch
Patch202: xen-pvfb-sigpipe.patch
-# patches to make VNC only listen on localhost by default
+# patches to make VNC only listen on localhost by default / use passwords
Patch221: xen-vnclisten-pvfb.patch
+Patch222: xen-vncpassword-5.patch
+Patch223: xen-vncpassword-pvfb-2.patch
Patch251: pygrub-manykernels.patch
+Patch252: pygrub-cosmetics.patch
# libVNCserver patches
Patch300: vnc-thread-fixes.patch
@@ -93,7 +96,7 @@
virtual machines.
%prep
-%setup -q -n xen-3.0.3-%{upstream} -a 1
+%setup -q -n xen-3.0.3_0-src -a 1
%patch1 -p1 -b .init
# Don't strip qemu-dm early, so that we get proper debuginfo
%patch2 -p1
@@ -101,10 +104,12 @@
%patch6 -p1
#patch8 -p1 # FIXME: need to pull this one back
%patch9 -p1
+#%patch10 -p1
+#%patch11 -p1
+%patch12 -p1
# blktap patches
%patch20 -p1
-%patch21 -p1
# config patches
%patch100 -p1
@@ -116,11 +121,14 @@
%patch201 -p1
%patch202 -p1
-# vnclisten patches
+# vnclisten/password patches
%patch221 -p1
+%patch222 -p1
+%patch223 -p1
# upstream patches
%patch251 -p1
+%patch252 -p1
# libVNCserver patches
pushd LibVNCServer-0.8.2
@@ -169,6 +177,7 @@
# create dirs in /var/run so that selinux contexts are right (#195952)
mkdir -p %{buildroot}/var/run/xend %{buildroot}/var/xen/dump %{buildroot}/var/log/xen
+mkdir -p %{buildroot}/var/lib/xen/images
# avoid conflicting with qemu (#199759)
rm -f %{buildroot}/%{_mandir}/man*/qemu*
@@ -208,7 +217,7 @@
%{_localstatedir}/lib/%{name}/*
%{_sysconfdir}/rc.d/init.d/*
%{_sysconfdir}/udev/rules.d/*
-%dir %{_sysconfdir}/%{name}
+%dir %attr(0700,root,root) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/sysconfig/xendomains
%dir %{_localstatedir}/lib/xenstored
@@ -231,6 +240,9 @@
%{_libdir}/*.a
%changelog
+* Tue Nov 14 2006 Juan Quintela <quintela at redhat.com> - 3.0.3-1%{dist}
+- Update to xen-3.0.3-8.rhel5.
+
* Tue Oct 17 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.3-0.1.rc3
- Rebase to xen-3.0.3-testing-rc3
- Revert 11728:30f13007be. Breaks Solaris guests.
--- xen-blktap-patches.patch DELETED ---
--- xen-revert-gzip.patch DELETED ---
More information about the fedora-cvs-commits
mailing list