[PATCH] Add support for building with gnutls with nettle as backend
--- Since gnutls 2.12, they default to nettle instead of gcrypt as default crypto backend. Since librtmp uses some of the crypto functions directly, this needs updates here. Implemented this by adding another CRYPTO option, GNUTLS_NETTLE. This is totally untested, since I don't really have access to any such rtmp streams that require use of the crypto libraries. Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6ef5742..0cf41be 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ CRYPTO=OPENSSL #CRYPTO=GNUTLS LIBZ=-lz LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) diff --git a/librtmp/Makefile b/librtmp/Makefile index a0125f1..353c6c8 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -21,14 +21,17 @@ CRYPTO=OPENSSL DEF_POLARSSL=-DUSE_POLARSSL DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS +DEF_GNUTLS_NETTLE=-DUSE_GNUTLS_NETTLE DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls +REQ_GNUTLS_NETTLE=gnutls REQ_OPENSSL=libssl,libcrypto LIBZ=-lz LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) diff --git a/librtmp/dh.h b/librtmp/dh.h index efef0fd..5d0739f 100644 --- a/librtmp/dh.h +++ b/librtmp/dh.h @@ -77,7 +77,8 @@ static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh) return 0; } -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) +#ifdef USE_GNUTLS #include <gcrypt.h> typedef gcry_mpi_t MP_t; #define MP_new(m) m = gcry_mpi_new(1) @@ -92,6 +93,23 @@ typedef gcry_mpi_t MP_t; #define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8 #define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u) #define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL) +#else +#include <gmp.h> +#include <nettle/bignum.h> +typedef mpz_ptr MP_t; +#define MP_new(m) m = malloc(sizeof(*m)); mpz_init2(m, 1) +#define MP_set_w(mpi, w) mpz_set_ui(mpi, w) +#define MP_cmp(u, v) mpz_cmp(u, v) +#define MP_set(u, v) mpz_set(u, v) +#define MP_sub_w(mpi, w) mpz_sub_ui(mpi, mpi, w) +#define MP_cmp_1(mpi) mpz_cmp_ui(mpi, 1) +#define MP_modexp(r, y, q, p) mpz_powm(r, y, q, p) +#define MP_free(mpi) free(mpi) +#define MP_gethex(u, hex, res) res = (mpz_set_str(u, hex, 16) == 0) +#define MP_bytes(u) mpz_sizeinbase(u, 8) +#define MP_setbin(u,buf,len) nettle_mpz_get_str_256(len,buf,u) +#define MP_getbin(u,buf,len) nettle_mpz_set_str_256_u(u,len,buf) +#endif typedef struct MDH { MP_t p; diff --git a/librtmp/handshake.h b/librtmp/handshake.h index 98bf3c8..354c419 100644 --- a/librtmp/handshake.h +++ b/librtmp/handshake.h @@ -59,6 +59,26 @@ typedef gcry_cipher_hd_t RC4_handle; #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void *)d,l,(void *)s,l) #define RC4_free(h) gcry_cipher_close(h) +#elif defined(USE_GNUTLS_NETTLE) +#include <nettle/hmac.h> +#include <nettle/arcfour.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) + +typedef struct arcfour_ctx* RC4_handle; +#define RC4_alloc(h) *h = malloc(sizeof(struct arcfour_ctx)) +#define RC4_setkey(h,l,k) arcfour_set_key(h, l, k) +#define RC4_encrypt(h,l,d) arcfour_crypt(h,l,(uint8_t *)d,(uint8_t *)d) +#define RC4_encrypt2(h,l,s,d) arcfour_crypt(h,l,(uint8_t *)s,(uint8_t *)d) +#define RC4_free(h) free(h) + #else /* USE_OPENSSL */ #include <openssl/sha.h> #include <openssl/hmac.h> diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c index 3c56b69..ca2084c 100644 --- a/librtmp/hashswf.c +++ b/librtmp/hashswf.c @@ -52,6 +52,17 @@ #define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len) #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen) #define HMAC_close(ctx) gcry_md_close(ctx) +#elif defined(USE_GNUTLS_NETTLE) +#include <nettle/hmac.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) #else /* USE_OPENSSL */ #include <openssl/ssl.h> #include <openssl/sha.h> diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index df2cb27..c9d5c83 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -34,7 +34,7 @@ #ifdef CRYPTO #ifdef USE_POLARSSL #include <polarssl/havege.h> -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include <gnutls/gnutls.h> #else /* USE_OPENSSL */ #include <openssl/ssl.h> @@ -204,7 +204,7 @@ RTMP_TLS_Init() /* Do this regardless of NO_SSL, we use havege for rtmpe too */ RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx)); havege_init(&RTMP_TLS_ctx->hs); -#elif defined(USE_GNUTLS) && !defined(NO_SSL) +#elif (defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE)) && !defined(NO_SSL) /* Technically we need to initialize libgcrypt ourselves if * we're not going to call gnutls_global_init(). Ignoring this * for now. diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h index 6a3f215..4958736 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h @@ -80,7 +80,7 @@ typedef struct tls_ctx { #define TLS_shutdown(s) ssl_close_notify(s) #define TLS_close(s) ssl_free(s); free(s) -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include <gnutls/gnutls.h> typedef struct tls_ctx { gnutls_certificate_credentials_t cred; -- 1.7.3.1
--- Updated after some initial testing. Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6ef5742..0cf41be 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ CRYPTO=OPENSSL #CRYPTO=GNUTLS LIBZ=-lz LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) diff --git a/librtmp/Makefile b/librtmp/Makefile index a0125f1..353c6c8 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -21,14 +21,17 @@ CRYPTO=OPENSSL DEF_POLARSSL=-DUSE_POLARSSL DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS +DEF_GNUTLS_NETTLE=-DUSE_GNUTLS_NETTLE DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls +REQ_GNUTLS_NETTLE=gnutls REQ_OPENSSL=libssl,libcrypto LIBZ=-lz LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) diff --git a/librtmp/dh.h b/librtmp/dh.h index efef0fd..fd60f31 100644 --- a/librtmp/dh.h +++ b/librtmp/dh.h @@ -77,7 +77,8 @@ static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh) return 0; } -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) +#ifdef USE_GNUTLS #include <gcrypt.h> typedef gcry_mpi_t MP_t; #define MP_new(m) m = gcry_mpi_new(1) @@ -92,6 +93,23 @@ typedef gcry_mpi_t MP_t; #define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8 #define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u) #define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL) +#else +#include <gmp.h> +#include <nettle/bignum.h> +typedef mpz_ptr MP_t; +#define MP_new(m) m = malloc(sizeof(*m)); mpz_init2(m, 1) +#define MP_set_w(mpi, w) mpz_set_ui(mpi, w) +#define MP_cmp(u, v) mpz_cmp(u, v) +#define MP_set(u, v) mpz_set(u, v) +#define MP_sub_w(mpi, w) mpz_sub_ui(mpi, mpi, w) +#define MP_cmp_1(mpi) mpz_cmp_ui(mpi, 1) +#define MP_modexp(r, y, q, p) mpz_powm(r, y, q, p) +#define MP_free(mpi) mpz_clear(mpi); free(mpi) +#define MP_gethex(u, hex, res) u = malloc(sizeof(*u)); mpz_init2(u, 1); res = (mpz_set_str(u, hex, 16) == 0) +#define MP_bytes(u) (mpz_sizeinbase(u, 2) + 7) / 8 +#define MP_setbin(u,buf,len) nettle_mpz_get_str_256(len,buf,u) +#define MP_getbin(u,buf,len) u = malloc(sizeof(*u)); mpz_init2(u, 1); nettle_mpz_set_str_256_u(u,len,buf) +#endif typedef struct MDH { MP_t p; diff --git a/librtmp/handshake.h b/librtmp/handshake.h index 98bf3c8..4c2ea7f 100644 --- a/librtmp/handshake.h +++ b/librtmp/handshake.h @@ -59,6 +59,26 @@ typedef gcry_cipher_hd_t RC4_handle; #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void *)d,l,(void *)s,l) #define RC4_free(h) gcry_cipher_close(h) +#elif defined(USE_GNUTLS_NETTLE) +#include <nettle/hmac.h> +#include <nettle/arcfour.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) + +typedef struct arcfour_ctx* RC4_handle; +#define RC4_alloc(h) *h = malloc(sizeof(struct arcfour_ctx)) +#define RC4_setkey(h,l,k) arcfour_set_key(h, l, k) +#define RC4_encrypt(h,l,d) arcfour_crypt(h,l,(uint8_t *)d,(uint8_t *)d) +#define RC4_encrypt2(h,l,s,d) arcfour_crypt(h,l,(uint8_t *)d,(uint8_t *)s) +#define RC4_free(h) free(h) + #else /* USE_OPENSSL */ #include <openssl/sha.h> #include <openssl/hmac.h> diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c index 3c56b69..ca2084c 100644 --- a/librtmp/hashswf.c +++ b/librtmp/hashswf.c @@ -52,6 +52,17 @@ #define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len) #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen) #define HMAC_close(ctx) gcry_md_close(ctx) +#elif defined(USE_GNUTLS_NETTLE) +#include <nettle/hmac.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) #else /* USE_OPENSSL */ #include <openssl/ssl.h> #include <openssl/sha.h> diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index df2cb27..c9d5c83 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -34,7 +34,7 @@ #ifdef CRYPTO #ifdef USE_POLARSSL #include <polarssl/havege.h> -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include <gnutls/gnutls.h> #else /* USE_OPENSSL */ #include <openssl/ssl.h> @@ -204,7 +204,7 @@ RTMP_TLS_Init() /* Do this regardless of NO_SSL, we use havege for rtmpe too */ RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx)); havege_init(&RTMP_TLS_ctx->hs); -#elif defined(USE_GNUTLS) && !defined(NO_SSL) +#elif (defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE)) && !defined(NO_SSL) /* Technically we need to initialize libgcrypt ourselves if * we're not going to call gnutls_global_init(). Ignoring this * for now. diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h index 6a3f215..4958736 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h @@ -80,7 +80,7 @@ typedef struct tls_ctx { #define TLS_shutdown(s) ssl_close_notify(s) #define TLS_close(s) ssl_free(s); free(s) -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include <gnutls/gnutls.h> typedef struct tls_ctx { gnutls_certificate_credentials_t cred; -- 1.7.3.1
On Sun, 7 Aug 2011, Martin Storsjo wrote:
--- Updated after some initial testing.
Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-)
Tested this version with a rtmpe:// url, which seemed to work fine. rtmps and swfhash verification still untested, if someone can test that, or can provide me with test setups for that, I'd appreciate it, so that this patch can be applied sometime. // Martin
On Tue, 15 Nov 2011, Martin Storsjö wrote:
On Sun, 7 Aug 2011, Martin Storsjo wrote:
--- Updated after some initial testing.
Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-)
Tested this version with a rtmpe:// url, which seemed to work fine. rtmps and swfhash verification still untested, if someone can test that, or can provide me with test setups for that, I'd appreciate it, so that this patch can be applied sometime.
Tested rtmps, too, which works fine with this patch. swfhash still untested. // Martin
On Mon, 28 Nov 2011, Martin Storsjö wrote:
On Tue, 15 Nov 2011, Martin Storsjö wrote:
On Sun, 7 Aug 2011, Martin Storsjo wrote:
--- Updated after some initial testing.
Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-)
Tested this version with a rtmpe:// url, which seemed to work fine. rtmps and swfhash verification still untested, if someone can test that, or can provide me with test setups for that, I'd appreciate it, so that this patch can be applied sometime.
Tested rtmps, too, which works fine with this patch. swfhash still untested.
Finally tested with an url requiring swfhash, too, seems to work. So, the patch sent on August 7th should be good to go, given that the build system stuff with CRYPTO=GNUTLS vs CRYPTO=GNUTLS_NETTLE is acceptable. (If the project had a configure system, one could try to detect which crypto backend is in use for gnutls, but without configure, it has to be selected manually like this.) // Martin
Since gcrypt is an utter disaster, and gnutls is using nettle as the default backend now, we could just use nettle and drop gcrypt. Of course, gnutls itself is also an utter disaster, with API/ABI compatibility breakages every few months. I really don't see the value in supporting gnutls any further at all. If you want a comprehensive crypto library that works, use OpenSSL. If you want a GPL'd crypto library that works, use PolarSSL. We don't need to support every flavor-of-the-month science project, we only need to support code that's actually usable. I've had a long time to watch the gnutls project flounder along. It's disturbing to see that they don't even have complete revision history in their git repo; there are entire subtrees appearing and disappearing without commit logs. Nobody sane would build an application that relies on such an out of control project. Martin Storsjo wrote:
--- Updated after some initial testing.
Makefile | 1 + librtmp/Makefile | 3 +++ librtmp/dh.h | 20 +++++++++++++++++++- librtmp/handshake.h | 20 ++++++++++++++++++++ librtmp/hashswf.c | 11 +++++++++++ librtmp/rtmp.c | 4 ++-- librtmp/rtmp_sys.h | 2 +- 7 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 6ef5742..0cf41be 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ CRYPTO=OPENSSL #CRYPTO=GNUTLS LIBZ=-lz LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) diff --git a/librtmp/Makefile b/librtmp/Makefile index a0125f1..353c6c8 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -21,14 +21,17 @@ CRYPTO=OPENSSL DEF_POLARSSL=-DUSE_POLARSSL DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS +DEF_GNUTLS_NETTLE=-DUSE_GNUTLS_NETTLE DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls +REQ_GNUTLS_NETTLE=gnutls REQ_OPENSSL=libssl,libcrypto LIBZ=-lz LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_GNUTLS_NETTLE=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) diff --git a/librtmp/dh.h b/librtmp/dh.h index efef0fd..fd60f31 100644 --- a/librtmp/dh.h +++ b/librtmp/dh.h @@ -77,7 +77,8 @@ static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh) return 0; }
-#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) +#ifdef USE_GNUTLS #include<gcrypt.h> typedef gcry_mpi_t MP_t; #define MP_new(m) m = gcry_mpi_new(1) @@ -92,6 +93,23 @@ typedef gcry_mpi_t MP_t; #define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8 #define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u) #define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL) +#else +#include<gmp.h> +#include<nettle/bignum.h> +typedef mpz_ptr MP_t; +#define MP_new(m) m = malloc(sizeof(*m)); mpz_init2(m, 1) +#define MP_set_w(mpi, w) mpz_set_ui(mpi, w) +#define MP_cmp(u, v) mpz_cmp(u, v) +#define MP_set(u, v) mpz_set(u, v) +#define MP_sub_w(mpi, w) mpz_sub_ui(mpi, mpi, w) +#define MP_cmp_1(mpi) mpz_cmp_ui(mpi, 1) +#define MP_modexp(r, y, q, p) mpz_powm(r, y, q, p) +#define MP_free(mpi) mpz_clear(mpi); free(mpi) +#define MP_gethex(u, hex, res) u = malloc(sizeof(*u)); mpz_init2(u, 1); res = (mpz_set_str(u, hex, 16) == 0) +#define MP_bytes(u) (mpz_sizeinbase(u, 2) + 7) / 8 +#define MP_setbin(u,buf,len) nettle_mpz_get_str_256(len,buf,u) +#define MP_getbin(u,buf,len) u = malloc(sizeof(*u)); mpz_init2(u, 1); nettle_mpz_set_str_256_u(u,len,buf) +#endif
typedef struct MDH { MP_t p; diff --git a/librtmp/handshake.h b/librtmp/handshake.h index 98bf3c8..4c2ea7f 100644 --- a/librtmp/handshake.h +++ b/librtmp/handshake.h @@ -59,6 +59,26 @@ typedef gcry_cipher_hd_t RC4_handle; #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void *)d,l,(void *)s,l) #define RC4_free(h) gcry_cipher_close(h)
+#elif defined(USE_GNUTLS_NETTLE) +#include<nettle/hmac.h> +#include<nettle/arcfour.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) + +typedef struct arcfour_ctx* RC4_handle; +#define RC4_alloc(h) *h = malloc(sizeof(struct arcfour_ctx)) +#define RC4_setkey(h,l,k) arcfour_set_key(h, l, k) +#define RC4_encrypt(h,l,d) arcfour_crypt(h,l,(uint8_t *)d,(uint8_t *)d) +#define RC4_encrypt2(h,l,s,d) arcfour_crypt(h,l,(uint8_t *)d,(uint8_t *)s) +#define RC4_free(h) free(h) + #else /* USE_OPENSSL */ #include<openssl/sha.h> #include<openssl/hmac.h> diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c index 3c56b69..ca2084c 100644 --- a/librtmp/hashswf.c +++ b/librtmp/hashswf.c @@ -52,6 +52,17 @@ #define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len) #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen) #define HMAC_close(ctx) gcry_md_close(ctx) +#elif defined(USE_GNUTLS_NETTLE) +#include<nettle/hmac.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#undef HMAC_CTX +#define HMAC_CTX struct hmac_sha256_ctx +#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key) +#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig) +#define HMAC_close(ctx) #else /* USE_OPENSSL */ #include<openssl/ssl.h> #include<openssl/sha.h> diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index df2cb27..c9d5c83 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -34,7 +34,7 @@ #ifdef CRYPTO #ifdef USE_POLARSSL #include<polarssl/havege.h> -#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include<gnutls/gnutls.h> #else /* USE_OPENSSL */ #include<openssl/ssl.h> @@ -204,7 +204,7 @@ RTMP_TLS_Init() /* Do this regardless of NO_SSL, we use havege for rtmpe too */ RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx)); havege_init(&RTMP_TLS_ctx->hs); -#elif defined(USE_GNUTLS)&& !defined(NO_SSL) +#elif (defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE))&& !defined(NO_SSL) /* Technically we need to initialize libgcrypt ourselves if * we're not going to call gnutls_global_init(). Ignoring this * for now. diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h index 6a3f215..4958736 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h @@ -80,7 +80,7 @@ typedef struct tls_ctx { #define TLS_shutdown(s) ssl_close_notify(s) #define TLS_close(s) ssl_free(s); free(s)
-#elif defined(USE_GNUTLS) +#elif defined(USE_GNUTLS) || defined(USE_GNUTLS_NETTLE) #include<gnutls/gnutls.h> typedef struct tls_ctx { gnutls_certificate_credentials_t cred;
-- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/
On Sun, 26 Feb 2012, Howard Chu wrote:
Since gcrypt is an utter disaster, and gnutls is using nettle as the default backend now, we could just use nettle and drop gcrypt.
Yes, that's also totally ok with me. As I wrote earlier, this is still missing some verification of the swfhash codepaths, I think I've got the rest of it tested already. Once someone with access to test urls that actually require the swfhash stuff has verified it, please go ahead.
Of course, gnutls itself is also an utter disaster, with API/ABI compatibility breakages every few months. I really don't see the value in supporting gnutls any further at all. If you want a comprehensive crypto library that works, use OpenSSL. If you want a GPL'd crypto library that works, use PolarSSL. We don't need to support every flavor-of-the-month science project, we only need to support code that's actually usable.
I'd still vote for keeping it - for many of my use cases, GPL isn't an option. // Martin
Martin Storsjö wrote:
On Sun, 26 Feb 2012, Howard Chu wrote:
Since gcrypt is an utter disaster, and gnutls is using nettle as the default backend now, we could just use nettle and drop gcrypt.
Yes, that's also totally ok with me.
As I wrote earlier, this is still missing some verification of the swfhash codepaths, I think I've got the rest of it tested already. Once someone with access to test urls that actually require the swfhash stuff has verified it, please go ahead.
Perhaps we just need to write a separate test wrapper instead; running the SWFhash is just a matter of hashing a known input and making sure it matches a known output. As long as the underlying SHA functions are correct, this should be easy to verify.
Of course, gnutls itself is also an utter disaster, with API/ABI compatibility breakages every few months. I really don't see the value in supporting gnutls any further at all. If you want a comprehensive crypto library that works, use OpenSSL. If you want a GPL'd crypto library that works, use PolarSSL. We don't need to support every flavor-of-the-month science project, we only need to support code that's actually usable.
I'd still vote for keeping it - for many of my use cases, GPL isn't an option.
I'll leave it in for now. Gluttons for punishment can use it if they want.
On Mon, 27 Feb 2012, Howard Chu wrote:
Martin Storsjö wrote:
On Sun, 26 Feb 2012, Howard Chu wrote:
Since gcrypt is an utter disaster, and gnutls is using nettle as the default backend now, we could just use nettle and drop gcrypt.
Yes, that's also totally ok with me.
As I wrote earlier, this is still missing some verification of the swfhash codepaths, I think I've got the rest of it tested already. Once someone with access to test urls that actually require the swfhash stuff has verified it, please go ahead.
Perhaps we just need to write a separate test wrapper instead; running the SWFhash is just a matter of hashing a known input and making sure it matches a known output. As long as the underlying SHA functions are correct, this should be easy to verify.
Right - verified that the nettle patch produces hashes identical to what the openssl codepath does. So I think this patch is ok to proceed now, either as is, or by removing the gcrypt support at the same time. // Martin
participants (2)
-
Howard Chu -
Martin Storsjo