[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/12] crypto: move built-in D3DES implementation int
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/12] crypto: move built-in D3DES implementation into crypto/ |
Date: |
Tue, 7 Jul 2015 16:12:40 +0200 |
From: "Daniel P. Berrange" <address@hidden>
To prepare for a generic internal cipher API, move the
built-in D3DES implementation into the crypto/ directory.
This is not in fact a normal D3DES implementation, it is
D3DES with double & triple length modes removed, and the
key bytes in reversed bit order. IOW it is crippled
specifically for the "benefit" of RFB, so call the new
files desrfb.c instead of d3des.c to make it clear that
it isn't a generally useful impl.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
crypto/Makefile.objs | 1 +
ui/d3des.c => crypto/desrfb.c | 2 +-
ui/d3des.h => include/crypto/desrfb.h | 0
ui/Makefile.objs | 2 +-
ui/vnc.c | 2 +-
5 files changed, 4 insertions(+), 3 deletions(-)
rename ui/d3des.c => crypto/desrfb.c (99%)
rename ui/d3des.h => include/crypto/desrfb.h (100%)
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index 9efc9b4..9f70294 100644
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -1,3 +1,4 @@
util-obj-y += init.o
util-obj-y += hash.o
util-obj-y += aes.o
+util-obj-y += desrfb.o
diff --git a/ui/d3des.c b/crypto/desrfb.c
similarity index 99%
rename from ui/d3des.c
rename to crypto/desrfb.c
index 5bc99b8..fc20a30 100644
--- a/ui/d3des.c
+++ b/crypto/desrfb.c
@@ -26,7 +26,7 @@
* (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
*/
-#include "d3des.h"
+#include "crypto/desrfb.h"
static void scrunch(unsigned char *, unsigned long *);
static void unscrun(unsigned long *, unsigned char *);
diff --git a/ui/d3des.h b/include/crypto/desrfb.h
similarity index 100%
rename from ui/d3des.h
rename to include/crypto/desrfb.h
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 023914c..dd1f8e4 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -1,4 +1,4 @@
-vnc-obj-y += vnc.o d3des.o
+vnc-obj-y += vnc.o
vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
vnc-obj-y += vnc-enc-tight.o vnc-palette.o
vnc-obj-y += vnc-enc-zrle.o
diff --git a/ui/vnc.c b/ui/vnc.c
index 2ffd9e5..b216182 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -48,7 +48,7 @@ static const struct timeval VNC_REFRESH_STATS = { 0, 500000 };
static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
#include "vnc_keysym.h"
-#include "d3des.h"
+#include "crypto/desrfb.h"
static QTAILQ_HEAD(, VncDisplay) vnc_displays =
QTAILQ_HEAD_INITIALIZER(vnc_displays);
--
2.4.3
- [Qemu-devel] [PULL v2 00/12] Final changes for 2.4-rc0, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 01/12] vl: move rom_load_all after machine init done, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 03/12] crypto: move built-in AES implementation into crypto/, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 04/12] crypto: move built-in D3DES implementation into crypto/,
Paolo Bonzini <=
- [Qemu-devel] [PULL 02/12] crypto: introduce new module for computing hash digests, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 08/12] block: convert quorum blockdrv to use crypto APIs, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 05/12] crypto: introduce generic cipher API & built-in implementation, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 07/12] crypto: add a nettle cipher implementation, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 11/12] ui: convert VNC to use generic cipher API, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 06/12] crypto: add a gcrypt cipher implementation, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 09/12] ui: convert VNC websockets to use crypto APIs, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 12/12] ossaudio: fix memory leak, Paolo Bonzini, 2015/07/07
- [Qemu-devel] [PULL 10/12] block: convert qcow/qcow2 to use generic cipher API, Paolo Bonzini, 2015/07/07