From 85fb69515cf1739bea53ce62b832a17e08ab3647 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Fri, 29 Jun 2018 12:30:17 +0200 Subject: crypto: move to common As of now, only LibVNCServer makes uses of these digest functions _and_ they depend on sys/uio.h, but in the future LibVNCClient will need those as well. --- CMakeLists.txt | 29 ++++++++++++++++++----- common/rfbcrypto.h | 16 +++++++++++++ common/rfbcrypto_gnutls.c | 50 +++++++++++++++++++++++++++++++++++++++ common/rfbcrypto_included.c | 49 ++++++++++++++++++++++++++++++++++++++ common/rfbcrypto_openssl.c | 49 ++++++++++++++++++++++++++++++++++++++ common/rfbcrypto_polarssl.c | 26 ++++++++++++++++++++ libvncserver/rfbcrypto.h | 16 ------------- libvncserver/rfbcrypto_gnutls.c | 50 --------------------------------------- libvncserver/rfbcrypto_included.c | 49 -------------------------------------- libvncserver/rfbcrypto_openssl.c | 49 -------------------------------------- libvncserver/rfbcrypto_polarssl.c | 26 -------------------- 11 files changed, 213 insertions(+), 196 deletions(-) create mode 100644 common/rfbcrypto.h create mode 100644 common/rfbcrypto_gnutls.c create mode 100644 common/rfbcrypto_included.c create mode 100644 common/rfbcrypto_openssl.c create mode 100644 common/rfbcrypto_polarssl.c delete mode 100644 libvncserver/rfbcrypto.h delete mode 100644 libvncserver/rfbcrypto_gnutls.c delete mode 100644 libvncserver/rfbcrypto_included.c delete mode 100644 libvncserver/rfbcrypto_openssl.c delete mode 100644 libvncserver/rfbcrypto_polarssl.c diff --git a/CMakeLists.txt b/CMakeLists.txt index b533494..26c686a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,25 +204,40 @@ if(SYSTEMD_FOUND) set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${SYSTEMD_LIBRARIES}) endif(SYSTEMD_FOUND) +if(LIBVNCSERVER_HAVE_SYS_UIO_H) + if(GNUTLS_FOUND) + message(STATUS "Building crypto with GnuTLS") + set(CRYPTO_LIBRARIES ${GNUTLS_LIBRARIES}) + set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_gnutls) + include_directories(${GNUTLS_INCLUDE_DIR}) + elseif(OPENSSL_FOUND) + message(STATUS "Building crypto with OpenSSL") + set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) + set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_openssl) + else() + message(STATUS "Building crypto with builtin functions") + set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c) + endif() +endif(LIBVNCSERVER_HAVE_SYS_UIO_H) + -if(WITH_WEBSOCKETS AND LIBVNCSERVER_HAVE_SYS_UIO_H) +if(WITH_WEBSOCKETS) set(LIBVNCSERVER_WITH_WEBSOCKETS 1) if(GNUTLS_FOUND) - set(LIBVNCSERVER_WITH_CLIENT_TLS 1) message(STATUS "Building websockets with GnuTLS") set(WEBSOCKET_LIBRARIES ${GNUTLS_LIBRARIES}) - set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls ${LIBVNCSERVER_DIR}/rfbcrypto_gnutls) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls) include_directories(${GNUTLS_INCLUDE_DIR}) elseif(OPENSSL_FOUND) message(STATUS "Building websockets with OpenSSL") set(WEBSOCKET_LIBRARIES ${OPENSSL_LIBRARIES}) - set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl) else() message(STATUS "Building websockets without SSL") set(WEBSOCKET_LIBRARIES) - set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c ${LIBVNCSERVER_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c) endif() -endif(WITH_WEBSOCKETS AND LIBVNCSERVER_HAVE_SYS_UIO_H) +endif(WITH_WEBSOCKETS) if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES) message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") @@ -400,6 +415,7 @@ if(LIBVNCSERVER_WITH_WEBSOCKETS) ${LIBVNCSERVER_DIR}/websockets.c ${LIBVNCSERVER_DIR}/ws_decode.c ${COMMON_DIR}/base64.c + ${CRYPTO_SOURCES} ${WSSRCS} ) endif(LIBVNCSERVER_WITH_WEBSOCKETS) @@ -422,6 +438,7 @@ target_link_libraries(vncserver ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} + ${CRYPTO_LIBRARIES} ${WEBSOCKET_LIBRARIES} ) diff --git a/common/rfbcrypto.h b/common/rfbcrypto.h new file mode 100644 index 0000000..fec095e --- /dev/null +++ b/common/rfbcrypto.h @@ -0,0 +1,16 @@ +#ifndef _RFB_CRYPTO_H +#define _RFB_CRYPTO_H 1 + +#include "rfb/rfbconfig.h" + +#define SHA1_HASH_SIZE 20 +#define MD5_HASH_SIZE 16 + +#ifdef LIBVNCSERVER_HAVE_SYS_UIO_H +#include + +void digestmd5(const struct iovec *iov, int iovcnt, void *dest); +void digestsha1(const struct iovec *iov, int iovcnt, void *dest); +#endif + +#endif diff --git a/common/rfbcrypto_gnutls.c b/common/rfbcrypto_gnutls.c new file mode 100644 index 0000000..2ecb2da --- /dev/null +++ b/common/rfbcrypto_gnutls.c @@ -0,0 +1,50 @@ +/* + * rfbcrypto_gnutls.c - Crypto wrapper (gnutls version) + */ + +/* + * Copyright (C) 2011 Gernot Tenchio + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include +#include "rfbcrypto.h" + +void digestmd5(const struct iovec *iov, int iovcnt, void *dest) +{ + gcry_md_hd_t c; + int i; + + gcry_md_open(&c, GCRY_MD_MD5, 0); + for (i = 0; i < iovcnt; i++) + gcry_md_write(c, iov[i].iov_base, iov[i].iov_len); + gcry_md_final(c); + memcpy(dest, gcry_md_read(c, 0), gcry_md_get_algo_dlen(GCRY_MD_MD5)); +} + +void digestsha1(const struct iovec *iov, int iovcnt, void *dest) +{ + gcry_md_hd_t c; + int i; + + gcry_md_open(&c, GCRY_MD_SHA1, 0); + for (i = 0; i < iovcnt; i++) + gcry_md_write(c, iov[i].iov_base, iov[i].iov_len); + gcry_md_final(c); + memcpy(dest, gcry_md_read(c, 0), gcry_md_get_algo_dlen(GCRY_MD_SHA1)); +} diff --git a/common/rfbcrypto_included.c b/common/rfbcrypto_included.c new file mode 100644 index 0000000..7feff61 --- /dev/null +++ b/common/rfbcrypto_included.c @@ -0,0 +1,49 @@ +/* + * rfbcrypto_included.c - Crypto wrapper (included version) + */ + +/* + * Copyright (C) 2011 Gernot Tenchio + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include "md5.h" +#include "sha.h" +#include "rfbcrypto.h" + +void digestmd5(const struct iovec *iov, int iovcnt, void *dest) +{ + struct md5_ctx c; + int i; + + __md5_init_ctx(&c); + for (i = 0; i < iovcnt; i++) + __md5_process_bytes(iov[i].iov_base, iov[i].iov_len, &c); + __md5_finish_ctx(&c, dest); +} + +void digestsha1(const struct iovec *iov, int iovcnt, void *dest) +{ + SHA1Context c; + int i; + + SHA1Reset(&c); + for (i = 0; i < iovcnt; i++) + SHA1Input(&c, iov[i].iov_base, iov[i].iov_len); + SHA1Result(&c, dest); +} diff --git a/common/rfbcrypto_openssl.c b/common/rfbcrypto_openssl.c new file mode 100644 index 0000000..29ec5c1 --- /dev/null +++ b/common/rfbcrypto_openssl.c @@ -0,0 +1,49 @@ +/* + * rfbcrypto_openssl.c - Crypto wrapper (openssl version) + */ + +/* + * Copyright (C) 2011 Gernot Tenchio + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include +#include +#include "rfbcrypto.h" + +void digestmd5(const struct iovec *iov, int iovcnt, void *dest) +{ + MD5_CTX c; + int i; + + MD5_Init(&c); + for (i = 0; i < iovcnt; i++) + MD5_Update(&c, iov[i].iov_base, iov[i].iov_len); + MD5_Final(dest, &c); +} + +void digestsha1(const struct iovec *iov, int iovcnt, void *dest) +{ + SHA_CTX c; + int i; + + SHA1_Init(&c); + for (i = 0; i < iovcnt; i++) + SHA1_Update(&c, iov[i].iov_base, iov[i].iov_len); + SHA1_Final(dest, &c); +} diff --git a/common/rfbcrypto_polarssl.c b/common/rfbcrypto_polarssl.c new file mode 100644 index 0000000..55e3a7b --- /dev/null +++ b/common/rfbcrypto_polarssl.c @@ -0,0 +1,26 @@ +#include +#include +#include +#include "rfbcrypto.h" + +void digestmd5(const struct iovec *iov, int iovcnt, void *dest) +{ + md5_context c; + int i; + + md5_starts(&c); + for (i = 0; i < iovcnt; i++) + md5_update(&c, iov[i].iov_base, iov[i].iov_len); + md5_finish(&c, dest); +} + +void digestsha1(const struct iovec *iov, int iovcnt, void *dest) +{ + sha1_context c; + int i; + + sha1_starts(&c); + for (i = 0; i < iovcnt; i++) + sha1_update(&c, iov[i].iov_base, iov[i].iov_len); + sha1_finish(&c, dest); +} diff --git a/libvncserver/rfbcrypto.h b/libvncserver/rfbcrypto.h deleted file mode 100644 index fec095e..0000000 --- a/libvncserver/rfbcrypto.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _RFB_CRYPTO_H -#define _RFB_CRYPTO_H 1 - -#include "rfb/rfbconfig.h" - -#define SHA1_HASH_SIZE 20 -#define MD5_HASH_SIZE 16 - -#ifdef LIBVNCSERVER_HAVE_SYS_UIO_H -#include - -void digestmd5(const struct iovec *iov, int iovcnt, void *dest); -void digestsha1(const struct iovec *iov, int iovcnt, void *dest); -#endif - -#endif diff --git a/libvncserver/rfbcrypto_gnutls.c b/libvncserver/rfbcrypto_gnutls.c deleted file mode 100644 index 2ecb2da..0000000 --- a/libvncserver/rfbcrypto_gnutls.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * rfbcrypto_gnutls.c - Crypto wrapper (gnutls version) - */ - -/* - * Copyright (C) 2011 Gernot Tenchio - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include -#include -#include "rfbcrypto.h" - -void digestmd5(const struct iovec *iov, int iovcnt, void *dest) -{ - gcry_md_hd_t c; - int i; - - gcry_md_open(&c, GCRY_MD_MD5, 0); - for (i = 0; i < iovcnt; i++) - gcry_md_write(c, iov[i].iov_base, iov[i].iov_len); - gcry_md_final(c); - memcpy(dest, gcry_md_read(c, 0), gcry_md_get_algo_dlen(GCRY_MD_MD5)); -} - -void digestsha1(const struct iovec *iov, int iovcnt, void *dest) -{ - gcry_md_hd_t c; - int i; - - gcry_md_open(&c, GCRY_MD_SHA1, 0); - for (i = 0; i < iovcnt; i++) - gcry_md_write(c, iov[i].iov_base, iov[i].iov_len); - gcry_md_final(c); - memcpy(dest, gcry_md_read(c, 0), gcry_md_get_algo_dlen(GCRY_MD_SHA1)); -} diff --git a/libvncserver/rfbcrypto_included.c b/libvncserver/rfbcrypto_included.c deleted file mode 100644 index 7feff61..0000000 --- a/libvncserver/rfbcrypto_included.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * rfbcrypto_included.c - Crypto wrapper (included version) - */ - -/* - * Copyright (C) 2011 Gernot Tenchio - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include -#include "md5.h" -#include "sha.h" -#include "rfbcrypto.h" - -void digestmd5(const struct iovec *iov, int iovcnt, void *dest) -{ - struct md5_ctx c; - int i; - - __md5_init_ctx(&c); - for (i = 0; i < iovcnt; i++) - __md5_process_bytes(iov[i].iov_base, iov[i].iov_len, &c); - __md5_finish_ctx(&c, dest); -} - -void digestsha1(const struct iovec *iov, int iovcnt, void *dest) -{ - SHA1Context c; - int i; - - SHA1Reset(&c); - for (i = 0; i < iovcnt; i++) - SHA1Input(&c, iov[i].iov_base, iov[i].iov_len); - SHA1Result(&c, dest); -} diff --git a/libvncserver/rfbcrypto_openssl.c b/libvncserver/rfbcrypto_openssl.c deleted file mode 100644 index 29ec5c1..0000000 --- a/libvncserver/rfbcrypto_openssl.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * rfbcrypto_openssl.c - Crypto wrapper (openssl version) - */ - -/* - * Copyright (C) 2011 Gernot Tenchio - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include -#include -#include -#include "rfbcrypto.h" - -void digestmd5(const struct iovec *iov, int iovcnt, void *dest) -{ - MD5_CTX c; - int i; - - MD5_Init(&c); - for (i = 0; i < iovcnt; i++) - MD5_Update(&c, iov[i].iov_base, iov[i].iov_len); - MD5_Final(dest, &c); -} - -void digestsha1(const struct iovec *iov, int iovcnt, void *dest) -{ - SHA_CTX c; - int i; - - SHA1_Init(&c); - for (i = 0; i < iovcnt; i++) - SHA1_Update(&c, iov[i].iov_base, iov[i].iov_len); - SHA1_Final(dest, &c); -} diff --git a/libvncserver/rfbcrypto_polarssl.c b/libvncserver/rfbcrypto_polarssl.c deleted file mode 100644 index 55e3a7b..0000000 --- a/libvncserver/rfbcrypto_polarssl.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include -#include -#include "rfbcrypto.h" - -void digestmd5(const struct iovec *iov, int iovcnt, void *dest) -{ - md5_context c; - int i; - - md5_starts(&c); - for (i = 0; i < iovcnt; i++) - md5_update(&c, iov[i].iov_base, iov[i].iov_len); - md5_finish(&c, dest); -} - -void digestsha1(const struct iovec *iov, int iovcnt, void *dest) -{ - sha1_context c; - int i; - - sha1_starts(&c); - for (i = 0; i < iovcnt; i++) - sha1_update(&c, iov[i].iov_base, iov[i].iov_len); - sha1_finish(&c, dest); -} -- cgit v1.2.3