nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to the latest version of ejurgensen's pair_ap library. With thanks.

Browse Source
This commit is contained in:
Mike Brady
2021-11-14 14:13:31 +00:00
parent fb1b2e9dff
commit 1032cad684
13 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pair_ap/pair_ap-master/.gitignore → pair_ap/.gitignore
View File
pair_ap/client-example.c
+15
View File
@@ -9,6 +9,10 @@
#include "evrtsp/evrtsp.h"
#include "pair.h"
#ifdef CONFIG_GCRYPT
# include <gcrypt.h>
#endif
#define DEVICE_ID "AABBCCDD11223344"
#define ACTIVE_REMOTE "3515324763"
#define DACP_ID "FF1DB45949E6CBD3"
@@ -553,6 +557,17 @@ main( int argc, char * argv[] )
content_type_setup = CONTENTTYPE_SETUP_HOMEKIT;
}
// libgcrypt requires that the application initializes the library
#ifdef CONFIG_GCRYPT
if (!gcry_check_version(NULL))
{
printf("libgcrypt not initialized\n");
return -1;
}
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
evbase = event_base_new();
evcon = evrtsp_connection_new(address, atoi(port));
evrtsp_connection_set_base(evcon, evbase);
pair_ap/pair_ap-master/evrtsp/evrtsp.h → pair_ap/evrtsp/evrtsp.h
View File
pair_ap/pair_ap-master/evrtsp/log.h → pair_ap/evrtsp/log.h
View File
pair_ap/pair_ap-master/evrtsp/rtsp-internal.h → pair_ap/evrtsp/rtsp-internal.h
View File
pair_ap/pair_ap-master/evrtsp/rtsp.c → pair_ap/evrtsp/rtsp.c
View File
pair_ap/pair-internal.h
+6
View File
@@ -225,6 +225,12 @@ struct pair_definition
};
/* ----------------------------- INITIALIZATION ---------------------------- */
bool
is_initialized(void);
/* -------------------- GCRYPT AND OPENSSL COMPABILITY --------------------- */
/* partly borrowed from ffmpeg (rtmpdh.c) */
pair_ap/pair.c
+21
View File
@@ -44,6 +44,27 @@ static struct pair_definition *pair[] = {
&pair_server_homekit,
};
/* ------------------------------ INITIALIZATION ---------------------------- */
bool
is_initialized(void)
{
if (sodium_init() == -1)
return false;
#if CONFIG_GCRYPT
// According to libgcrypt documentation: "It is important that these
// initialization steps are not done by a library but by the actual
// application. A library using Libgcrypt might want to check for finished
// initialization using:"
if (!gcry_control (GCRYCTL_INITIALIZATION_FINISHED_P))
return false;
#endif
return true;
}
/* -------------------------- SHARED HASHING HELPERS ------------------------ */
int
pair_ap/pair.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <stdint.h>
#define PAIR_AP_VERSION_MAJOR 0
#define PAIR_AP_VERSION_MINOR 8
#define PAIR_AP_VERSION_MINOR 10
#define PAIR_AP_DEVICE_ID_LEN_MAX 64
pair_ap/pair_fruit.c
+2 -2
View File
@@ -601,7 +601,7 @@ client_setup_new(struct pair_setup_context *handle, const char *pin, pair_cb add
{
struct pair_client_setup_context *sctx = &handle->sctx.client;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (!pin || strlen(pin) < 4)
@@ -876,7 +876,7 @@ client_verify_new(struct pair_verify_context *handle, const char *client_setup_k
const char *ptr;
int i;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (!client_setup_keys)
pair_ap/pair_homekit.c
+4 -4
View File
@@ -1137,7 +1137,7 @@ client_setup_new(struct pair_setup_context *handle, const char *pin, pair_cb add
{
struct pair_client_setup_context *sctx = &handle->sctx.client;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (handle->type == &pair_client_homekit_normal)
@@ -1626,7 +1626,7 @@ client_verify_new(struct pair_verify_context *handle, const char *client_setup_k
struct pair_client_verify_context *vctx = &handle->vctx.client;
size_t hexkey_len;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (!device_id || strlen(device_id) >= PAIR_AP_DEVICE_ID_LEN_MAX)
@@ -1950,7 +1950,7 @@ server_setup_new(struct pair_setup_context *handle, const char *pin, pair_cb add
{
struct pair_server_setup_context *sctx = &handle->sctx.server;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (!pin)
@@ -2396,7 +2396,7 @@ server_verify_new(struct pair_verify_context *handle, const char *client_setup_k
{
struct pair_server_verify_context *vctx = &handle->vctx.server;
if (sodium_init() == -1)
if (!is_initialized())
return -1;
if (client_setup_keys)
pair_ap/server-example.c
+15
View File
@@ -37,6 +37,10 @@
#include "pair.h"
#ifdef CONFIG_GCRYPT
# include <gcrypt.h>
#endif
#define DEVICE_ID "FFEEDDCCBBAA9988"
#define LISTEN_PORT 7000
#define CONTENT_TYPE_OCTET "application/octet-stream"
@@ -668,6 +672,17 @@ main(int argc, char * argv[])
struct event_base *evbase;
struct evconnlistener *listener;
// libgcrypt requires that the application initializes the library
#ifdef CONFIG_GCRYPT
if (!gcry_check_version(NULL))
{
printf("libgcrypt not initialized\n");
return -1;
}
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
evbase = event_base_new();
listener = listen_add(evbase, in_accept_cb, in_error_cb, LISTEN_PORT);
shairport.c
+31 -4
View File
@@ -44,6 +44,7 @@
#include "config.h"
#ifdef CONFIG_AIRPLAY_2
#include <gcrypt.h>
#include <sodium.h>
#include <uuid/uuid.h>
#endif
@@ -1786,8 +1787,10 @@ int main(int argc, char **argv) {
// mDNS string.
// note: 0x300401F4A00 works but with weird delays and stuff
// config.airplay_features = 0x1C340405FCA00;
uint64_t mask = ((uint64_t)1 << 17) | ((uint64_t)1 << 16) | ((uint64_t)1 << 15) | ((uint64_t)1 << 50);
config.airplay_features = 0x1C340405D4A00 & (~mask); // APX + Authentication4 (b14) with no metadata (see below)
uint64_t mask =
((uint64_t)1 << 17) | ((uint64_t)1 << 16) | ((uint64_t)1 << 15) | ((uint64_t)1 << 50);
config.airplay_features =
0x1C340405D4A00 & (~mask); // APX + Authentication4 (b14) with no metadata (see below)
// Advertised with mDNS and returned with GET /info, see
// https://openairplay.github.io/airplay-spec/status_flags.html 0x4: Audio cable attached, no PIN
// required (transient pairing), 0x204: Audio cable attached, OneTimePairingRequired 0x604: Audio
@@ -1802,7 +1805,7 @@ int main(int argc, char **argv) {
config.airplay_features |= (1 << 15); // 15 is artwork
#endif
debug(1,"Features: 0x%" PRIx64 ".", config.airplay_features);
debug(1, "Features: 0x%" PRIx64 ".", config.airplay_features);
config.airplay_statusflags = 0x04;
// Set to NULL to work with transient pairing
config.airplay_pin = NULL;
@@ -1910,6 +1913,29 @@ int main(int argc, char **argv) {
} else {
debug(1, "libsodium initialised.");
}
// this code is based on
// https://www.gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
/* Version check should be the very first call because it
makes sure that important subsystems are initialized.
#define NEED_LIBGCRYPT_VERSION to the minimum required version. */
#define NEED_LIBGCRYPT_VERSION "1.5.4"
if (!gcry_check_version(NEED_LIBGCRYPT_VERSION)) {
die("libgcrypt is too old (need %s, have %s).", NEED_LIBGCRYPT_VERSION,
gcry_check_version(NULL));
}
/* Disable secure memory. */
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
/* ... If required, other initialization goes here. */
/* Tell Libgcrypt that initialization has completed. */
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
/* Mess around with the latency options */
@@ -1962,7 +1988,8 @@ int main(int argc, char **argv) {
debug(2, "userSuppliedLatency is %d.", config.userSuppliedLatency);
debug(1, "interpolation setting is \"%s\".",
config.packet_stuffing == ST_basic ? "basic"
: config.packet_stuffing == ST_soxr ? "soxr" : "auto");
: config.packet_stuffing == ST_soxr ? "soxr"
: "auto");
debug(1, "interpolation soxr_delay_threshold is %d.", config.soxr_delay_threshold);
debug(1, "resync time is %f seconds.", config.resyncthreshold);
debug(1, "allow a session to be interrupted: %d.", config.allow_session_interruption);