Attachment #373812 for bug #503604

View | Details | Raw Unified | Return to bug 503604
Collapse All | Expand All

Lines 72-78 static int MDH_generate_key(MDH *dh) Link Here

(-)a/librtmp/dh.h (-1 / +1 lines)
72	static int MDH_compute_key(uint8_t secret, size_t len, MP_t pub, MDH dh)	72	static int MDH_compute_key(uint8_t secret, size_t len, MP_t pub, MDH dh)
73	{	73	{
74	MP_set(&dh->ctx.GY, pub);	74	MP_set(&dh->ctx.GY, pub);
75	dhm_calc_secret(&dh->ctx, secret, &len);	75	dhm_calc_secret(&dh->ctx, secret, &len, NULL, NULL);
76	return 0;	76	return 0;
77	}	77	}
78		78




/* This file is #included in rtmp.c, it is not meant to be compiled alone */

#ifdef USE_POLARSSL
#include <polarssl/compat-1.2.h>
#include <polarssl/sha256.h>
#include <polarssl/arc4.h>
#ifndef SHA256_DIGEST_LENGTH
#define SHA256_DIGEST_LENGTH	32
#endif
#define HMAC_CTX	sha256_context
#define HMAC_setup(ctx, key, len)	sha256_hmac_starts(&ctx, (unsigned char *)key, len, 0)
#define HMAC_crunch(ctx, buf, len)	sha256_hmac_update(&ctx, buf, len)
#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha256_hmac_finish(&ctx, dig)

typedef arc4_context *	RC4_handle;
#define RC4_alloc(h)	*h = malloc(sizeof(arc4_context))





#ifdef CRYPTO
#ifdef USE_POLARSSL
#include <polarssl/sha256.h>
#ifndef SHA256_DIGEST_LENGTH
#define SHA256_DIGEST_LENGTH	32
#endif
#define HMAC_CTX sha256_context
#define HMAC_setup(ctx, key, len)	sha256_hmac_starts(&ctx, (unsigned char *)key, len, 0)
#define HMAC_crunch(ctx, buf, len)	sha256_hmac_update(&ctx, buf, len)
#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; sha256_hmac_finish(&ctx, dig)
#define HMAC_close(ctx)
#elif defined(USE_GNUTLS)
#include <nettle/hmac.h>




} tls_ctx;
typedef struct tls_server_ctx {
	havege_state *hs;
	x509_crt cert;
	rsa_context key;
	ssl_session ssn;
	const char *dhm_P, *dhm_G;

#define TLS_client(ctx,s)	s = malloc(sizeof(ssl_context)); ssl_init(s);\
	ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\
	ssl_set_rng(s, havege_random, &ctx->hs);\
	ssl_set_ciphersuites(s, ssl_default_ciphersuites);\
	SSL_SET_SESSION(s, 1, 600, &ctx->ssn)
#define TLS_server(ctx,s)	s = malloc(sizeof(ssl_context)); ssl_init(s);\
	ssl_set_endpoint(s, SSL_IS_SERVER); ssl_set_authmode(s, SSL_VERIFY_NONE);\
	ssl_set_rng(s, havege_random, ((tls_server_ctx*)ctx)->hs);\
	ssl_set_ciphersuites(s, ssl_default_ciphersuites);\
	SSL_SET_SESSION(s, 1, 600, &((tls_server_ctx*)ctx)->ssn);\
	ssl_set_own_cert_rsa(s, &((tls_server_ctx*)ctx)->cert, &((tls_server_ctx*)ctx)->key);\
	ssl_set_dh_param(s, ((tls_server_ctx*)ctx)->dhm_P, ((tls_server_ctx*)ctx)->dhm_G)
#define TLS_setfd(s,fd)	ssl_set_bio(s, net_recv, &fd, net_send, &fd)
#define TLS_connect(s)	ssl_handshake(s)
- 

Return to bug 503604

Lines 79-85 typedef struct tls_ctx { Link Here

(-)a/librtmp/rtmp_sys.h (-5 / +2 lines)
79	} tls_ctx;	79	} tls_ctx;
80	typedef struct tls_server_ctx {	80	typedef struct tls_server_ctx {
81	havege_state *hs;	81	havege_state *hs;
82	x509_cert cert;	82	x509_crt cert;
83	rsa_context key;	83	rsa_context key;
84	ssl_session ssn;	84	ssl_session ssn;
85	const char dhm_P, dhm_G;	85	const char dhm_P, dhm_G;
Lines 89-102 typedef struct tls_server_ctx { Link Here
89	#define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\	89	#define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\
90	ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\	90	ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\
91	ssl_set_rng(s, havege_random, &ctx->hs);\	91	ssl_set_rng(s, havege_random, &ctx->hs);\
92	ssl_set_ciphersuites(s, ssl_default_ciphersuites);\
93	SSL_SET_SESSION(s, 1, 600, &ctx->ssn)	92	SSL_SET_SESSION(s, 1, 600, &ctx->ssn)
94	#define TLS_server(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\	93	#define TLS_server(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\
95	ssl_set_endpoint(s, SSL_IS_SERVER); ssl_set_authmode(s, SSL_VERIFY_NONE);\	94	ssl_set_endpoint(s, SSL_IS_SERVER); ssl_set_authmode(s, SSL_VERIFY_NONE);\
96	ssl_set_rng(s, havege_random, ((tls_server_ctx*)ctx)->hs);\	95	ssl_set_rng(s, havege_random, ((tls_server_ctx*)ctx)->hs);\
97	ssl_set_ciphersuites(s, ssl_default_ciphersuites);\
98	SSL_SET_SESSION(s, 1, 600, &((tls_server_ctx*)ctx)->ssn);\	96	SSL_SET_SESSION(s, 1, 600, &((tls_server_ctx*)ctx)->ssn);\
99	ssl_set_own_cert(s, &((tls_server_ctx)ctx)->cert, &((tls_server_ctx)ctx)->key);\	97	ssl_set_own_cert_rsa(s, &((tls_server_ctx)ctx)->cert, &((tls_server_ctx)ctx)->key);\
100	ssl_set_dh_param(s, ((tls_server_ctx)ctx)->dhm_P, ((tls_server_ctx)ctx)->dhm_G)	98	ssl_set_dh_param(s, ((tls_server_ctx)ctx)->dhm_P, ((tls_server_ctx)ctx)->dhm_G)
101	#define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd)	99	#define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd)
102	#define TLS_connect(s) ssl_handshake(s)	100	#define TLS_connect(s) ssl_handshake(s)
103	-

Lines 25-39 Link Here

(-)a/librtmp/handshake.h (-5 / +6 lines)
25	/* This file is #included in rtmp.c, it is not meant to be compiled alone */	25	/* This file is #included in rtmp.c, it is not meant to be compiled alone */
26		26
27	#ifdef USE_POLARSSL	27	#ifdef USE_POLARSSL
28	#include <polarssl/sha2.h>	28	#include <polarssl/compat-1.2.h>
		29	#include <polarssl/sha256.h>
29	#include <polarssl/arc4.h>	30	#include <polarssl/arc4.h>
30	#ifndef SHA256_DIGEST_LENGTH	31	#ifndef SHA256_DIGEST_LENGTH
31	#define SHA256_DIGEST_LENGTH 32	32	#define SHA256_DIGEST_LENGTH 32
32	#endif	33	#endif
33	#define HMAC_CTX sha2_context	34	#define HMAC_CTX sha256_context
34	#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)	35	#define HMAC_setup(ctx, key, len) sha256_hmac_starts(&ctx, (unsigned char *)key, len, 0)
35	#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)	36	#define HMAC_crunch(ctx, buf, len) sha256_hmac_update(&ctx, buf, len)
36	#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)	37	#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha256_hmac_finish(&ctx, dig)
37		38
38	typedef arc4_context * RC4_handle;	39	typedef arc4_context * RC4_handle;
39	#define RC4_alloc(h) *h = malloc(sizeof(arc4_context))	40	#define RC4_alloc(h) *h = malloc(sizeof(arc4_context))

Lines 32-45 Link Here

(-)a/librtmp/hashswf.c (-5 / +5 lines)
32		32
33	#ifdef CRYPTO	33	#ifdef CRYPTO
34	#ifdef USE_POLARSSL	34	#ifdef USE_POLARSSL
35	#include <polarssl/sha2.h>	35	#include <polarssl/sha256.h>
36	#ifndef SHA256_DIGEST_LENGTH	36	#ifndef SHA256_DIGEST_LENGTH
37	#define SHA256_DIGEST_LENGTH 32	37	#define SHA256_DIGEST_LENGTH 32
38	#endif	38	#endif
39	#define HMAC_CTX sha2_context	39	#define HMAC_CTX sha256_context
40	#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)	40	#define HMAC_setup(ctx, key, len) sha256_hmac_starts(&ctx, (unsigned char *)key, len, 0)
41	#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)	41	#define HMAC_crunch(ctx, buf, len) sha256_hmac_update(&ctx, buf, len)
42	#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)	42	#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha256_hmac_finish(&ctx, dig)
43	#define HMAC_close(ctx)	43	#define HMAC_close(ctx)
44	#elif defined(USE_GNUTLS)	44	#elif defined(USE_GNUTLS)
45	#include <nettle/hmac.h>	45	#include <nettle/hmac.h>