Commit 99b81b95 authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' into zrtp

parents d160844a de8ecee1
......@@ -59,7 +59,7 @@ err_status_t ortp_srtp_init(void);
err_status_t ortp_srtp_create(srtp_t *session, const srtp_policy_t *policy);
err_status_t ortp_srtp_dealloc(srtp_t session);
err_status_t ortp_srtp_add_stream(srtp_t session, const srtp_policy_t *policy);
void ortp_crypto_get_random(uint8_t *tmp, int size);
err_status_t ortp_crypto_get_random(uint8_t *tmp, int size);
bool_t ortp_srtp_supported(void);
int srtp_transport_new(srtp_t srtp, RtpTransport **rtpt, RtpTransport **rtcpt );
......
......@@ -24,6 +24,7 @@
#endif
#include "ortp/ortp.h"
#include "ortp/ortp_srtp.h"
#ifdef HAVE_SRTP
#undef PACKAGE_NAME
......@@ -31,7 +32,6 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#include "ortp/ortp_srtp.h"
#include "ortp/b64.h"
......@@ -234,9 +234,9 @@ static bool_t ortp_init_srtp_policy(srtp_t srtp, srtp_policy_t* policy, enum ort
return TRUE;
}
void ortp_crypto_get_random(uint8_t *tmp, int size)
err_status_t ortp_crypto_get_random(uint8_t *tmp, int size)
{
crypto_get_random(tmp, size);
return crypto_get_random(tmp, size);
}
srtp_t ortp_srtp_create_configure_session(enum ortp_srtp_crypto_suite_t suite, uint32_t ssrc, const char* snd_key, const char* rcv_key)
......@@ -288,9 +288,9 @@ err_status_t ortp_srtp_init(void) {
return 0;
}
void ortp_crypto_get_random(uint8_t *tmp, int size)
err_status_t ortp_crypto_get_random(uint8_t *tmp, int size)
{
return -1;
}
int srtp_transport_new(void *i, RtpTransport **rtpt, RtpTransport **rtcpt ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment