From: Mike Brady <mikebrady@eircom.net>
Date: Sun, 27 Jan 2019 13:50:54 +0000 (+0000)
Subject: Remove some unnecessary code "protecting" some use of the OpenSSL library.
X-Git-Tag: 3.3RC0~66^2~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea770b2b13df95cb00e30366855917b78c0290ce;p=thirdparty%2Fshairport-sync.git

Remove some unnecessary code "protecting" some use of the OpenSSL library.
---

diff --git a/shairport.c b/shairport.c
index 292acf25..15f8b9c8 100644
--- a/shairport.c
+++ b/shairport.c
@@ -2,7 +2,7 @@
  * Shairport, an Apple Airplay receiver
  * Copyright (c) James Laird 2013
  * All rights reserved.
- * Modifications (c) Mike Brady 2014--2018
+ * Modifications and additions (c) Mike Brady 2014--2019
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -1602,14 +1602,10 @@ int main(int argc, char **argv) {
   uint8_t ap_md5[16];
 
 #ifdef CONFIG_OPENSSL
-  // can't imagine this is necessary, but here it is anyway
-  int oldState;
-  pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldState); // make this un-cancellable
   MD5_CTX ctx;
   MD5_Init(&ctx);
   MD5_Update(&ctx, config.service_name, strlen(config.service_name));
   MD5_Final(ap_md5, &ctx);
-  pthread_setcancelstate(oldState, NULL);
 #endif
 
 #ifdef CONFIG_MBEDTLS