mxe/src/polarssl-1-fixes.patch

46 lines
1.5 KiB
Diff
Raw Normal View History

This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 2 Dec 2015 18:47:45 +1100
Subject: [PATCH 1/2] Security fix for CVE-2015-1182 from:
https://polarssl.org/tech-updates/security-advisories/polarssl-security-advisory-2014-04
diff --git a/library/asn1parse.c b/library/asn1parse.c
index 1111111..2222222 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p,
if( cur->next == NULL )
return( POLARSSL_ERR_ASN1_MALLOC_FAILED );
+ memset( cur->next, 0, sizeof( asn1_sequence ) );
+
cur = cur->next;
}
}
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 2 Dec 2015 18:50:21 +1100
Subject: [PATCH 2/2] fix shared lib install locations
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1111111..2222222 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -131,6 +131,8 @@ if(USE_SHARED_POLARSSL_LIBRARY)
endif()
install(TARGETS polarssl
- DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(USE_SHARED_POLARSSL_LIBRARY)