Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi

6 files changed, 215 insertions, 21 deletions

diff --git a/ports/librtmp/CONTROL b/ports/librtmp/CONTROL
index c353b087e..9afbe903f 100644
--- a/ports/librtmp/CONTROL
+++ b/ports/librtmp/CONTROL
@@ -1,5 +1,5 @@
 Source: librtmp
-Version: 2.4-2
+Version: 2019-11-11_1
 Build-Depends: zlib, openssl
 Homepage: https://rtmpdump.mplayerhq.hu
 Description: RTMPDump Real-Time Messaging Protocol API
diff --git a/ports/librtmp/dh.patch b/ports/librtmp/dh.patch
new file mode 100644
index 000000000..4b0345354
--- /dev/null
+++ b/ports/librtmp/dh.patch
@@ -0,0 +1,136 @@
+diff --git a/librtmp/dh.h b/librtmp/dh.h
+index 8e285a60c..ea562d200 100644
+--- a/librtmp/dh.h	
++++ b/librtmp/dh.h
+@@ -139,11 +139,14 @@ typedef BIGNUM * MP_t;
+ #define MP_setbin(u,buf,len)	BN_bn2bin(u,buf)
+ #define MP_getbin(u,buf,len)	u = BN_bin2bn(buf,len,0)
+ 
++
+ #define MDH	DH
+ #define MDH_new()	DH_new()
+ #define MDH_free(dh)	DH_free(dh)
+ #define MDH_generate_key(dh)	DH_generate_key(dh)
+ #define MDH_compute_key(secret, seclen, pub, dh)	DH_compute_key(secret, pub, dh)
++#define MPH_set_pqg(dh, p, q, g, res)  res = DH_set0_pqg(dh, p, q, g)
++#define MPH_set_length(dh, len, res)  res = DH_set_length(dh,len)
+ 
+ #endif
+ 
+@@ -152,7 +155,7 @@ typedef BIGNUM * MP_t;
+ 
+ /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */
+ static int
+-isValidPublicKey(MP_t y, MP_t p, MP_t q)
++isValidPublicKey(const MP_t y,const MP_t p, MP_t q)
+ {
+   int ret = TRUE;
+   MP_t bn;
+@@ -211,20 +214,33 @@ DHInit(int nKeyBits)
+   if (!dh)
+     goto failed;
+ 
+-  MP_new(dh->g);
++  MP_t g,p;
++  MP_new(g);
+ 
+-  if (!dh->g)
++  if (!g) 
++  {
+     goto failed;
++  }
+ 
+-  MP_gethex(dh->p, P1024, res);	/* prime P1024, see dhgroups.h */
++  DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
++  MP_gethex(p, P1024, res);	/* prime P1024, see dhgroups.h */
+   if (!res)
+     {
+       goto failed;
+     }
+ 
+-  MP_set_w(dh->g, 2);	/* base 2 */
+-
+-  dh->length = nKeyBits;
++  MP_set_w(g, 2);	/* base 2 */
++  MPH_set_pqg(dh,p,NULL,g, res);
++  if (!res)
++  {
++    MP_free(g);
++    goto failed;
++  }
++  MPH_set_length(dh,nKeyBits, res);
++  if (!res)
++  {
++    goto failed;
++  }
+   return dh;
+ 
+ failed:
+@@ -250,14 +267,11 @@ DHGenerateKey(MDH *dh)
+ 
+       MP_gethex(q1, Q1024, res);
+       assert(res);
+-
+-      res = isValidPublicKey(dh->pub_key, dh->p, q1);
++      res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1);
+       if (!res)
+-	{
+-	  MP_free(dh->pub_key);
+-	  MP_free(dh->priv_key);
+-	  dh->pub_key = dh->priv_key = 0;
+-	}
++        {
++              MDH_free(dh); // Cannot set priv_key to nullptr so there is no way to generate a new pub/priv key pair in openssl 1.1.1.
++        }
+ 
+       MP_free(q1);
+     }
+@@ -272,15 +286,16 @@ static int
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+   int len;
+-  if (!dh || !dh->pub_key)
++  MP_t pub = DH_get0_pub_key(dh);
++  if (!dh || !pub)
+     return 0;
+ 
+-  len = MP_bytes(dh->pub_key);
++  len = MP_bytes(pub);
+   if (len <= 0 || len > (int) nPubkeyLen)
+     return 0;
+ 
+   memset(pubkey, 0, nPubkeyLen);
+-  MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++  MP_setbin(pub, pubkey + (nPubkeyLen - len), len);
+   return 1;
+ }
+ 
+@@ -288,15 +303,16 @@ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ static int
+ DHGetPrivateKey(MDH *dh, uint8_t *privkey, size_t nPrivkeyLen)
+ {
+-  if (!dh || !dh->priv_key)
++  MP_t priv = DH_get0_priv_key(dh);
++  if (!dh || !priv)
+     return 0;
+ 
+-  int len = MP_bytes(dh->priv_key);
++  int len = MP_bytes(priv);
+   if (len <= 0 || len > (int) nPrivkeyLen)
+     return 0;
+ 
+   memset(privkey, 0, nPrivkeyLen);
+-  MP_setbin(dh->priv_key, privkey + (nPrivkeyLen - len), len);
++  MP_setbin(priv, privkey + (nPrivkeyLen - len), len);
+   return 1;
+ }
+ #endif
+@@ -322,7 +338,7 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen,
+   MP_gethex(q1, Q1024, len);
+   assert(len);
+ 
+-  if (isValidPublicKey(pubkeyBn, dh->p, q1))
++  if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1))
+     res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
+   else
+     res = -1;
diff --git a/ports/librtmp/handshake.patch b/ports/librtmp/handshake.patch
new file mode 100644
index 000000000..88f5d2458
--- /dev/null
+++ b/ports/librtmp/handshake.patch
@@ -0,0 +1,35 @@
+diff --git a/librtmp/handshake.h b/librtmp/handshake.h
+index 98bf3c877..0819152bd 100644
+--- a/librtmp/handshake.h	
++++ b/librtmp/handshake.h
+@@ -66,9 +66,9 @@ typedef gcry_cipher_hd_t	RC4_handle;
+ #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
+ #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
+ #endif
+-#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
+-#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
+-#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
++#define HMAC_setup(ctx, key, len)	ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
++#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, buf, len)
++#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
+ 
+ typedef RC4_KEY *	RC4_handle;
+ #define RC4_alloc(h)	*h = malloc(sizeof(RC4_KEY))
+@@ -114,7 +114,7 @@ static void InitRC4Encryption
+ {
+   uint8_t digest[SHA256_DIGEST_LENGTH];
+   unsigned int digestLen = 0;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+ 
+   RC4_alloc(rc4keyIn);
+   RC4_alloc(rc4keyOut);
+@@ -263,7 +263,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key,
+ 	   size_t keylen, uint8_t *digest)
+ {
+   unsigned int digestLen;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+ 
+   HMAC_setup(ctx, key, keylen);
+   HMAC_crunch(ctx, message, messageLen);
diff --git a/ports/librtmp/hashswf.patch b/ports/librtmp/hashswf.patch
new file mode 100644
index 000000000..fb29549f3
--- /dev/null
+++ b/ports/librtmp/hashswf.patch
@@ -0,0 +1,28 @@
+diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c
+index 3c56b6922..964a64d01 100644
+--- a/librtmp/hashswf.c	
++++ b/librtmp/hashswf.c
+@@ -57,10 +57,10 @@
+ #include <openssl/sha.h>
+ #include <openssl/hmac.h>
+ #include <openssl/rc4.h>
+-#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
+-#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, (unsigned char *)buf, len)
+-#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
+-#define HMAC_close(ctx)	HMAC_CTX_cleanup(&ctx)
++#define HMAC_setup(ctx, key, len)	ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
++#define HMAC_crunch(ctx, buf, len)	HMAC_Update(ctx, (unsigned char *)buf, len)
++#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(ctx, (unsigned char *)dig, &dlen);
++#define HMAC_close(ctx)	HMAC_CTX_free(ctx)
+ #endif
+ 
+ extern void RTMP_TLS_Init();
+@@ -289,7 +289,7 @@ leave:
+ struct info
+ {
+   z_stream *zs;
+-  HMAC_CTX ctx;
++  HMAC_CTX *ctx;
+   int first;
+   int zlib;
+   int size;
diff --git a/ports/librtmp/hide_netstackdump.patch b/ports/librtmp/hide_netstackdump.patch
index 2ae44e46b..1cc7c8c5a 100644
--- a/ports/librtmp/hide_netstackdump.patch
+++ b/ports/librtmp/hide_netstackdump.patch
@@ -1,8 +1,8 @@
 diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
-index 5ef3ae9..7c6a010 100644
+index 0865689..b00710e 100644
 --- a/librtmp/rtmp.c
 +++ b/librtmp/rtmp.c
-@@ -129,7 +129,7 @@ static int clk_tck;
+@@ -155,7 +155,7 @@ static int clk_tck;
  uint32_t
  RTMP_GetTime()
  {
@@ -11,7 +11,7 @@ index 5ef3ae9..7c6a010 100644
    return 0;
  #elif defined(_WIN32)
    return timeGetTime();
-@@ -1256,7 +1256,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet)
+@@ -1381,7 +1381,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet)
    return bHasMediaPacket;
  }
  
@@ -20,8 +20,8 @@ index 5ef3ae9..7c6a010 100644
  extern FILE *netstackdump;
  extern FILE *netstackdump_read;
  #endif
-@@ -1333,7 +1333,7 @@ ReadN(RTMP *r, char *buffer, int n)
- 	    SendBytesReceived(r);
+@@ -1469,7 +1469,7 @@ ReadN(RTMP *r, char *buffer, int n)
+ 	        return FALSE;
  	}
        /*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */
 -#ifdef _DEBUG
@@ -29,7 +29,7 @@ index 5ef3ae9..7c6a010 100644
        fwrite(ptr, 1, nBytes, netstackdump_read);
  #endif
  
-@@ -3064,7 +3064,7 @@ HandShake(RTMP *r, int FP9HandShake)
+@@ -3757,7 +3757,7 @@ HandShake(RTMP *r, int FP9HandShake)
  
    memset(&clientsig[4], 0, 4);
  
@@ -38,7 +38,7 @@ index 5ef3ae9..7c6a010 100644
    for (i = 8; i < RTMP_SIG_SIZE; i++)
      clientsig[i] = 0xff;
  #else
-@@ -3136,7 +3136,7 @@ SHandShake(RTMP *r)
+@@ -3829,7 +3829,7 @@ SHandShake(RTMP *r)
    memcpy(serversig, &uptime, 4);
  
    memset(&serversig[4], 0, 4);
@@ -47,7 +47,7 @@ index 5ef3ae9..7c6a010 100644
    for (i = 8; i < RTMP_SIG_SIZE; i++)
      serversig[i] = 0xff;
  #else
-@@ -3553,7 +3553,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
+@@ -4298,7 +4298,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
  {
    int rc;
  
diff --git a/ports/librtmp/portfile.cmake b/ports/librtmp/portfile.cmake
index 609d098b8..6f4e73e3d 100644
--- a/ports/librtmp/portfile.cmake
+++ b/ports/librtmp/portfile.cmake
@@ -1,18 +1,13 @@
-include(vcpkg_common_functions)
+set(RTMPDUMP_REVISION c5f04a58fc2aeea6296ca7c44ee4734c18401aa3)
 
-set(RTMPDUMP_VERSION 2.4)
-set(RTMPDUMP_FILENAME rtmpdump-${RTMPDUMP_VERSION}.tar.gz)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://rtmpdump.mplayerhq.hu/download/${RTMPDUMP_FILENAME}"
-    FILENAME "${RTMPDUMP_FILENAME}"
-    SHA512 a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    URL https://git.ffmpeg.org/rtmpdump
+    REF ${RTMPDUMP_REVISION}
     PATCHES
+        dh.patch                #Openssl 1.1.1 patch
+        handshake.patch         #Openssl 1.1.1 patch
+        hashswf.patch           #Openssl 1.1.1 patch
         fix_strncasecmp.patch
         hide_netstackdump.patch
 )