mirror of
https://github.com/moonlight-stream/moonlight-ios.git
synced 2026-10-25 13:31:47 +00:00
Update to OpenSSL 1.1.1t
This commit is contained in:
1 parent
924e79d00f
commit
5c47cb8908
448 files changed
+97963
-931
No files matched your search
@@ -1,104 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
SYSROOT_iPHONE="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
|
|
||||||
SYSROOT_SIMULATOR="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
|
|
||||||
CC_IPHONE="xcrun -sdk iphoneos clang"
|
|
||||||
CC_SIMULATOR="xcrun -sdk iphonesimulator clang"
|
|
||||||
function build_one {
|
|
||||||
./configure \
|
|
||||||
--prefix=$PREFIX \
|
|
||||||
--disable-ffmpeg \
|
|
||||||
--disable-ffplay \
|
|
||||||
--disable-ffprobe \
|
|
||||||
--disable-ffserver \
|
|
||||||
--disable-armv5te \
|
|
||||||
--disable-armv6 \
|
|
||||||
--disable-doc \
|
|
||||||
--disable-everything \
|
|
||||||
--disable-debug \
|
|
||||||
--enable-decoder=h264 \
|
|
||||||
--enable-avresample \
|
|
||||||
--enable-cross-compile \
|
|
||||||
--sysroot=$SYSROOT \
|
|
||||||
--target-os=darwin \
|
|
||||||
--cc="$CC" \
|
|
||||||
--extra-cflags="$CFLAGS" \
|
|
||||||
--extra-ldflags="$LDFLAGS" \
|
|
||||||
--enable-pic \
|
|
||||||
$ADDI_FLAGS
|
|
||||||
make clean && make -j4 && make install
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# armv7
|
|
||||||
function build_armv7 {
|
|
||||||
PREFIX="armv7"
|
|
||||||
SYSROOT=$SYSROOT_iPHONE
|
|
||||||
CC=$CC_IPHONE
|
|
||||||
CFLAGS="-arch armv7 -mfpu=neon -miphoneos-version-min=7.1 -fpic"
|
|
||||||
LDFLAGS="-arch armv7 -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
|
|
||||||
ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
|
|
||||||
build_one
|
|
||||||
}
|
|
||||||
|
|
||||||
# armv7s
|
|
||||||
function build_armv7s {
|
|
||||||
PREFIX="armv7s"
|
|
||||||
SYSROOT=$SYSROOT_iPHONE
|
|
||||||
CC=$CC_IPHONE
|
|
||||||
CFLAGS="-arch armv7s -mfpu=neon -miphoneos-version-min=7.1"
|
|
||||||
LDFLAGS="-arch armv7s -isysroot $SYSROOT_iPHONE -miphoneos-version-min=7.1"
|
|
||||||
ADDI_FLAGS="--arch=arm --cpu=cortex-a9"
|
|
||||||
build_one
|
|
||||||
}
|
|
||||||
|
|
||||||
# i386
|
|
||||||
function build_i386 {
|
|
||||||
PREFIX="i386"
|
|
||||||
SYSROOT=$SYSROOT_SIMULATOR
|
|
||||||
CC=$CC_SIMULATOR
|
|
||||||
CFLAGS="-arch i386"
|
|
||||||
LDFLAGS="-arch i386 -isysroot $SYSROOT_SIMULATOR -mios-simulator-version-min=7.1"
|
|
||||||
ADDI_FLAGS="--arch=i386 --cpu=i386 --disable-asm"
|
|
||||||
build_one
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# create fat library
|
|
||||||
function build_universal {
|
|
||||||
cd armv7/lib
|
|
||||||
for file in *.a
|
|
||||||
do
|
|
||||||
cd ../..
|
|
||||||
xcrun -sdk iphoneos lipo -output universal/lib/$file -create \
|
|
||||||
-arch armv7 armv7/lib/$file \
|
|
||||||
-arch armv7s armv7s/lib/$file \
|
|
||||||
-arch i386 i386/lib/$file
|
|
||||||
echo "Universal $file created."
|
|
||||||
cd -
|
|
||||||
done
|
|
||||||
cd ../..
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "FFmpeg directory?"
|
|
||||||
read SOURCE
|
|
||||||
|
|
||||||
cd $SOURCE
|
|
||||||
|
|
||||||
if [ "$1" = "clean" ]
|
|
||||||
then
|
|
||||||
rm -r armv7 armv7s i386 universal
|
|
||||||
make clean
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
mkdir armv7
|
|
||||||
mkdir armv7s
|
|
||||||
mkdir i386
|
|
||||||
mkdir -p universal/lib
|
|
||||||
|
|
||||||
build_armv7
|
|
||||||
build_armv7s
|
|
||||||
build_i386
|
|
||||||
build_universal
|
|
||||||
echo "Ouput files in $SOURCE/armv7 $SOURCE/armv7s $SOURCE/i386 $SOURCE/universal"
|
|
||||||
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Yay shell scripting! This script builds a static version of
|
|
||||||
# OpenSSL ${OPENSSL_VERSION} for iOS 7.0 that contains code for
|
|
||||||
# armv6, armv7, arm7s and i386.
|
|
||||||
|
|
||||||
#set -x
|
|
||||||
|
|
||||||
# Setup paths to stuff we need
|
|
||||||
|
|
||||||
OPENSSL_VERSION="1.0.1h"
|
|
||||||
|
|
||||||
DEVELOPER="/Applications/Xcode.app/Contents/Developer"
|
|
||||||
|
|
||||||
SDK_VERSION="7.1"
|
|
||||||
MIN_VERSION="7.1"
|
|
||||||
|
|
||||||
IPHONEOS_PLATFORM="${DEVELOPER}/Platforms/iPhoneOS.platform"
|
|
||||||
IPHONEOS_SDK="${IPHONEOS_PLATFORM}/Developer/SDKs/iPhoneOS.sdk"
|
|
||||||
IPHONEOS_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
|
||||||
|
|
||||||
IPHONESIMULATOR_PLATFORM="${DEVELOPER}/Platforms/iPhoneSimulator.platform"
|
|
||||||
IPHONESIMULATOR_SDK="${IPHONESIMULATOR_PLATFORM}/Developer/SDKs/iPhoneSimulator.sdk"
|
|
||||||
IPHONESIMULATOR_GCC="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
|
|
||||||
|
|
||||||
# Make sure things actually exist
|
|
||||||
|
|
||||||
if [ ! -d "$IPHONEOS_PLATFORM" ]; then
|
|
||||||
echo "Cannot find $IPHONEOS_PLATFORM"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d "$IPHONEOS_SDK" ]; then
|
|
||||||
echo "Cannot find $IPHONEOS_SDK"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -x "$IPHONEOS_GCC" ]; then
|
|
||||||
echo "Cannot find $IPHONEOS_GCC"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d "$IPHONESIMULATOR_PLATFORM" ]; then
|
|
||||||
echo "Cannot find $IPHONESIMULATOR_PLATFORM"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -d "$IPHONESIMULATOR_SDK" ]; then
|
|
||||||
echo "Cannot find $IPHONESIMULATOR_SDK"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -x "$IPHONESIMULATOR_GCC" ]; then
|
|
||||||
echo "Cannot find $IPHONESIMULATOR_GCC"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clean up whatever was left from our previous build
|
|
||||||
|
|
||||||
rm -rf include lib
|
|
||||||
rm -rf /tmp/openssl-${OPENSSL_VERSION}-*
|
|
||||||
rm -rf /tmp/openssl-${OPENSSL_VERSION}-*.*-log
|
|
||||||
|
|
||||||
build()
|
|
||||||
{
|
|
||||||
TARGET=$1
|
|
||||||
ARCH=$2
|
|
||||||
GCC=$3
|
|
||||||
SDK=$4
|
|
||||||
EXTRA=$5
|
|
||||||
rm -rf "openssl-${OPENSSL_VERSION}"
|
|
||||||
tar xfz "openssl-${OPENSSL_VERSION}.tar.gz"
|
|
||||||
pushd .
|
|
||||||
cd "openssl-${OPENSSL_VERSION}"
|
|
||||||
./Configure ${TARGET} --openssldir="/tmp/openssl-${OPENSSL_VERSION}-${ARCH}" ${EXTRA} &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.log"
|
|
||||||
perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
|
|
||||||
perl -i -pe "s|^CC= gcc|CC= ${GCC} -arch ${ARCH} -miphoneos-version-min=${MIN_VERSION}|g" Makefile
|
|
||||||
perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${SDK} \$1|g" Makefile
|
|
||||||
make &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.build-log"
|
|
||||||
make install &> "/tmp/openssl-${OPENSSL_VERSION}-${ARCH}.install-log"
|
|
||||||
popd
|
|
||||||
rm -rf "openssl-${OPENSSL_VERSION}"
|
|
||||||
}
|
|
||||||
|
|
||||||
mkdir openssl
|
|
||||||
cd openssl
|
|
||||||
if [ ! -e ${OPENSSL_VERSION}.tar.gz ]; then
|
|
||||||
echo "Downloading ${OPENSSL_VERSION}.tar.gz"
|
|
||||||
curl -O http://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
|
|
||||||
else
|
|
||||||
echo "Using ${OPENSSL_VERSION}.tar.gz"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
build "BSD-generic32" "armv7" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
|
|
||||||
build "BSD-generic32" "armv7s" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
|
|
||||||
build "BSD-generic64" "arm64" "${IPHONEOS_GCC}" "${IPHONEOS_SDK}" ""
|
|
||||||
build "BSD-generic32" "i386" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" ""
|
|
||||||
build "BSD-generic64" "x86_64" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}" "-DOPENSSL_NO_ASM"
|
|
||||||
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir include
|
|
||||||
cp -r /tmp/openssl-${OPENSSL_VERSION}-i386/include/openssl include/
|
|
||||||
|
|
||||||
mkdir lib
|
|
||||||
lipo \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libcrypto.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libcrypto.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libcrypto.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libcrypto.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libcrypto.a" \
|
|
||||||
-create -output lib/libcrypto.a
|
|
||||||
lipo \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-armv7/lib/libssl.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-armv7s/lib/libssl.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-arm64/lib/libssl.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-i386/lib/libssl.a" \
|
|
||||||
"/tmp/openssl-${OPENSSL_VERSION}-x86_64/lib/libssl.a" \
|
|
||||||
-create -output lib/libssl.a
|
|
||||||
|
|
||||||
rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*"
|
|
||||||
rm -rf "/tmp/openssl-${OPENSSL_VERSION}-*.*-log"
|
|
||||||
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
archiveVersion = 1;
|
archiveVersion = 1;
|
||||||
classes = {
|
classes = {
|
||||||
};
|
};
|
||||||
objectVersion = 48;
|
objectVersion = 52;
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
@@ -31,6 +31,8 @@
|
|||||||
9896219A23D56E8100211983 /* X1Kit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9896219623D15C7000211983 /* X1Kit.swift */; };
|
9896219A23D56E8100211983 /* X1Kit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9896219623D15C7000211983 /* X1Kit.swift */; };
|
||||||
9897B6A1221260EF00966419 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 9897B6A0221260EF00966419 /* Controller.m */; };
|
9897B6A1221260EF00966419 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 9897B6A0221260EF00966419 /* Controller.m */; };
|
||||||
9897B6A62212732C00966419 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 9897B6A0221260EF00966419 /* Controller.m */; };
|
9897B6A62212732C00966419 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 9897B6A0221260EF00966419 /* Controller.m */; };
|
||||||
|
98A2E31129B5256200CA17A7 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98A2E31029B5256200CA17A7 /* OpenSSL.xcframework */; };
|
||||||
|
98A2E31229B5256E00CA17A7 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98A2E31029B5256200CA17A7 /* OpenSSL.xcframework */; };
|
||||||
98B9CE6D27B2144B00B473C4 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B9CE6C27B2144B00B473C4 /* AVKit.framework */; };
|
98B9CE6D27B2144B00B473C4 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B9CE6C27B2144B00B473C4 /* AVKit.framework */; };
|
||||||
98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98AB2E841CAD46840089BB98 /* libmoonlight-common.a */; };
|
98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98AB2E841CAD46840089BB98 /* libmoonlight-common.a */; };
|
||||||
98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */; };
|
98D5856D1C0EA79600F6CC00 /* TemporaryHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D5856C1C0EA79600F6CC00 /* TemporaryHost.m */; };
|
||||||
@@ -72,8 +74,6 @@
|
|||||||
FB1A67E02132460A00507771 /* Logger.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD1C8E11A8AD71400C6703C /* Logger.m */; };
|
FB1A67E02132460A00507771 /* Logger.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD1C8E11A8AD71400C6703C /* Logger.m */; };
|
||||||
FB1A67E32132498A00507771 /* Limelight.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */; };
|
FB1A67E32132498A00507771 /* Limelight.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */; };
|
||||||
FB1A67E521324A1F00507771 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1A67E421324A1F00507771 /* CoreData.framework */; };
|
FB1A67E521324A1F00507771 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1A67E421324A1F00507771 /* CoreData.framework */; };
|
||||||
FB1A67E621324DD600507771 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E019F6AFB800339C8A /* libcrypto.a */; };
|
|
||||||
FB1A67E721324DD600507771 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E119F6AFB800339C8A /* libssl.a */; };
|
|
||||||
FB1A67E821324DE300507771 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946EA19F6AFB800339C8A /* libopus.a */; };
|
FB1A67E821324DE300507771 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946EA19F6AFB800339C8A /* libopus.a */; };
|
||||||
FB1A67EA21324DF300507771 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1A67E921324DF300507771 /* libxml2.tbd */; };
|
FB1A67EA21324DF300507771 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FB1A67E921324DF300507771 /* libxml2.tbd */; };
|
||||||
FB1A6819213284FB00507771 /* UIComputerView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86DF19F7A837001C18A8 /* UIComputerView.m */; };
|
FB1A6819213284FB00507771 /* UIComputerView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86DF19F7A837001C18A8 /* UIComputerView.m */; };
|
||||||
@@ -116,8 +116,6 @@
|
|||||||
FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462519F646E200339C8A /* MainFrameViewController.m */; };
|
FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462519F646E200339C8A /* MainFrameViewController.m */; };
|
||||||
FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462719F646E200339C8A /* StreamFrameViewController.m */; };
|
FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462719F646E200339C8A /* StreamFrameViewController.m */; };
|
||||||
FB89463819F6473800339C8A /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FB89463719F6473800339C8A /* Launch Screen.xib */; };
|
FB89463819F6473800339C8A /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FB89463719F6473800339C8A /* Launch Screen.xib */; };
|
||||||
FB8946EB19F6AFE100339C8A /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E019F6AFB800339C8A /* libcrypto.a */; };
|
|
||||||
FB8946EC19F6AFE400339C8A /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E119F6AFB800339C8A /* libssl.a */; };
|
|
||||||
FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946EA19F6AFB800339C8A /* libopus.a */; };
|
FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946EA19F6AFB800339C8A /* libopus.a */; };
|
||||||
FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD271A7C84ED00872C98 /* HttpResponse.m */; };
|
FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD271A7C84ED00872C98 /* HttpResponse.m */; };
|
||||||
FB9AFD321A7D867C00872C98 /* AppAssetRetriever.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD311A7D867C00872C98 /* AppAssetRetriever.m */; };
|
FB9AFD321A7D867C00872C98 /* AppAssetRetriever.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD311A7D867C00872C98 /* AppAssetRetriever.m */; };
|
||||||
@@ -195,6 +193,7 @@
|
|||||||
9896219623D15C7000211983 /* X1Kit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = X1Kit.swift; path = X1Kit/Sources/X1Kit/X1Kit.swift; sourceTree = "<group>"; };
|
9896219623D15C7000211983 /* X1Kit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = X1Kit.swift; path = X1Kit/Sources/X1Kit/X1Kit.swift; sourceTree = "<group>"; };
|
||||||
9897B6A0221260EF00966419 /* Controller.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
|
9897B6A0221260EF00966419 /* Controller.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
|
||||||
9897B6A32212610800966419 /* Controller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
|
9897B6A32212610800966419 /* Controller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
|
||||||
|
98A2E31029B5256200CA17A7 /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = libs/OpenSSL.xcframework; sourceTree = "<group>"; };
|
||||||
98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "moonlight-common/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
|
98AB2E7F1CAD46830089BB98 /* moonlight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "moonlight-common.xcodeproj"; path = "moonlight-common/moonlight-common.xcodeproj"; sourceTree = "<group>"; };
|
||||||
98B9CE6C27B2144B00B473C4 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS15.2.sdk/System/Library/Frameworks/AVKit.framework; sourceTree = DEVELOPER_DIR; };
|
98B9CE6C27B2144B00B473C4 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS15.2.sdk/System/Library/Frameworks/AVKit.framework; sourceTree = DEVELOPER_DIR; };
|
||||||
98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryHost.h; path = Database/TemporaryHost.h; sourceTree = "<group>"; };
|
98D5856B1C0EA79600F6CC00 /* TemporaryHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporaryHost.h; path = Database/TemporaryHost.h; sourceTree = "<group>"; };
|
||||||
@@ -393,13 +392,12 @@
|
|||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
98A2E31129B5256200CA17A7 /* OpenSSL.xcframework in Frameworks */,
|
||||||
9865DC30213260B40005B9B9 /* libmoonlight-common-tv.a in Frameworks */,
|
9865DC30213260B40005B9B9 /* libmoonlight-common-tv.a in Frameworks */,
|
||||||
9865DC3C2132922E0005B9B9 /* GameController.framework in Frameworks */,
|
9865DC3C2132922E0005B9B9 /* GameController.framework in Frameworks */,
|
||||||
FB1A67EA21324DF300507771 /* libxml2.tbd in Frameworks */,
|
FB1A67EA21324DF300507771 /* libxml2.tbd in Frameworks */,
|
||||||
FB1A67E821324DE300507771 /* libopus.a in Frameworks */,
|
FB1A67E821324DE300507771 /* libopus.a in Frameworks */,
|
||||||
98181BEB2791278F00E43572 /* libSDL2.a in Frameworks */,
|
98181BEB2791278F00E43572 /* libSDL2.a in Frameworks */,
|
||||||
FB1A67E621324DD600507771 /* libcrypto.a in Frameworks */,
|
|
||||||
FB1A67E721324DD600507771 /* libssl.a in Frameworks */,
|
|
||||||
FB1A67E521324A1F00507771 /* CoreData.framework in Frameworks */,
|
FB1A67E521324A1F00507771 /* CoreData.framework in Frameworks */,
|
||||||
98B9CE6D27B2144B00B473C4 /* AVKit.framework in Frameworks */,
|
98B9CE6D27B2144B00B473C4 /* AVKit.framework in Frameworks */,
|
||||||
);
|
);
|
||||||
@@ -409,11 +407,10 @@
|
|||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
98A2E31229B5256E00CA17A7 /* OpenSSL.xcframework in Frameworks */,
|
||||||
9890CF6B203B7EE1006C4B06 /* libxml2.tbd in Frameworks */,
|
9890CF6B203B7EE1006C4B06 /* libxml2.tbd in Frameworks */,
|
||||||
98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */,
|
98CFB82F1CAD481B0048EF74 /* libmoonlight-common.a in Frameworks */,
|
||||||
FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */,
|
FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */,
|
||||||
FB8946EB19F6AFE100339C8A /* libcrypto.a in Frameworks */,
|
|
||||||
FB8946EC19F6AFE400339C8A /* libssl.a in Frameworks */,
|
|
||||||
FB290CF419B2C406004C83CF /* CoreGraphics.framework in Frameworks */,
|
FB290CF419B2C406004C83CF /* CoreGraphics.framework in Frameworks */,
|
||||||
FB290CF819B2C406004C83CF /* CoreData.framework in Frameworks */,
|
FB290CF819B2C406004C83CF /* CoreData.framework in Frameworks */,
|
||||||
98181BED2791281100E43572 /* CoreMotion.framework in Frameworks */,
|
98181BED2791281100E43572 /* CoreMotion.framework in Frameworks */,
|
||||||
@@ -480,6 +477,7 @@
|
|||||||
FB290CF019B2C406004C83CF /* Frameworks */ = {
|
FB290CF019B2C406004C83CF /* Frameworks */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
98A2E31029B5256200CA17A7 /* OpenSSL.xcframework */,
|
||||||
98B9CE6C27B2144B00B473C4 /* AVKit.framework */,
|
98B9CE6C27B2144B00B473C4 /* AVKit.framework */,
|
||||||
98181BEC2791281100E43572 /* CoreMotion.framework */,
|
98181BEC2791281100E43572 /* CoreMotion.framework */,
|
||||||
98181BE82791275D00E43572 /* libSDL2.a */,
|
98181BE82791275D00E43572 /* libSDL2.a */,
|
||||||
@@ -1152,10 +1150,12 @@
|
|||||||
"$(PROJECT_DIR)/libs/**",
|
"$(PROJECT_DIR)/libs/**",
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "Moonlight TV/Info.plist";
|
INFOPLIST_FILE = "Moonlight TV/Info.plist";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
"@executable_path/Frameworks",
|
||||||
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/openssl/lib/tvOS",
|
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
||||||
);
|
);
|
||||||
@@ -1198,10 +1198,12 @@
|
|||||||
"$(PROJECT_DIR)/libs/**",
|
"$(PROJECT_DIR)/libs/**",
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "Moonlight TV/Info.plist";
|
INFOPLIST_FILE = "Moonlight TV/Info.plist";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
"@executable_path/Frameworks",
|
||||||
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/openssl/lib/tvOS",
|
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
"$(PROJECT_DIR)/libs/opus/lib/tvOS",
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/tvOS",
|
||||||
);
|
);
|
||||||
@@ -1345,11 +1347,13 @@
|
|||||||
"$(PROJECT_DIR)/libs/**",
|
"$(PROJECT_DIR)/libs/**",
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
|
INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
"@executable_path/Frameworks",
|
||||||
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/openssl/lib/iOS",
|
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 8.4.1;
|
MARKETING_VERSION = 8.4.1;
|
||||||
@@ -1384,11 +1388,13 @@
|
|||||||
"$(PROJECT_DIR)/libs/**",
|
"$(PROJECT_DIR)/libs/**",
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
|
INFOPLIST_FILE = "Limelight/Limelight-Info.plist";
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
"@executable_path/Frameworks",
|
||||||
|
);
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
"$(PROJECT_DIR)/libs/opus/lib/iOS",
|
||||||
"$(PROJECT_DIR)/libs/openssl/lib/iOS",
|
|
||||||
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
"$(PROJECT_DIR)/libs/SDL2/lib/iOS",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 8.4.1;
|
MARKETING_VERSION = 8.4.1;
|
||||||
@@ -1396,9 +1402,10 @@
|
|||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE = "";
|
PROVISIONING_PROFILE = "";
|
||||||
SKIP_INSTALL = NO;
|
SKIP_INSTALL = NO;
|
||||||
|
SWIFT_COMPILATION_MODE = wholemodule;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Limelight/Input/Moonlight-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Limelight/Input/Moonlight-Bridging-Header.h";
|
||||||
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Moonlight-Swift.h";
|
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Moonlight-Swift.h";
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||||
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
1. Pull latest https://github.com/x2on/OpenSSL-for-iPhone
|
||||||
|
2. Patch build-libssl.sh to adjust IOS_MIN_SDK_VERSION and TVOS_MIN_SDK_VERSION
|
||||||
|
3. ./build-libssl.sh --disable-bitcode --targets="ios-sim-cross-x86_64 ios-sim-cross-arm64 ios-cross-arm64 tvos-sim-cross-x86_64 tvos-sim-cross-arm64 tvos-cross-arm64"
|
||||||
|
4. ./create-xcframework.sh
|
||||||
|
5. Copy OpenSSL.xcframework into moonlight-ios/libs
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>AvailableLibraries</key>
|
||||||
|
<array>
|
||||||
|
<dict>
|
||||||
|
<key>HeadersPath</key>
|
||||||
|
<string>Headers</string>
|
||||||
|
<key>LibraryIdentifier</key>
|
||||||
|
<string>tvos-arm64_x86_64-simulator</string>
|
||||||
|
<key>LibraryPath</key>
|
||||||
|
<string>OpenSSL-tvOS-Sim.a</string>
|
||||||
|
<key>SupportedArchitectures</key>
|
||||||
|
<array>
|
||||||
|
<string>arm64</string>
|
||||||
|
<string>x86_64</string>
|
||||||
|
</array>
|
||||||
|
<key>SupportedPlatform</key>
|
||||||
|
<string>tvos</string>
|
||||||
|
<key>SupportedPlatformVariant</key>
|
||||||
|
<string>simulator</string>
|
||||||
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>HeadersPath</key>
|
||||||
|
<string>Headers</string>
|
||||||
|
<key>LibraryIdentifier</key>
|
||||||
|
<string>ios-arm64_x86_64-simulator</string>
|
||||||
|
<key>LibraryPath</key>
|
||||||
|
<string>OpenSSL-iOS-Sim.a</string>
|
||||||
|
<key>SupportedArchitectures</key>
|
||||||
|
<array>
|
||||||
|
<string>arm64</string>
|
||||||
|
<string>x86_64</string>
|
||||||
|
</array>
|
||||||
|
<key>SupportedPlatform</key>
|
||||||
|
<string>ios</string>
|
||||||
|
<key>SupportedPlatformVariant</key>
|
||||||
|
<string>simulator</string>
|
||||||
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>HeadersPath</key>
|
||||||
|
<string>Headers</string>
|
||||||
|
<key>LibraryIdentifier</key>
|
||||||
|
<string>ios-arm64</string>
|
||||||
|
<key>LibraryPath</key>
|
||||||
|
<string>OpenSSL-iOS.a</string>
|
||||||
|
<key>SupportedArchitectures</key>
|
||||||
|
<array>
|
||||||
|
<string>arm64</string>
|
||||||
|
</array>
|
||||||
|
<key>SupportedPlatform</key>
|
||||||
|
<string>ios</string>
|
||||||
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>HeadersPath</key>
|
||||||
|
<string>Headers</string>
|
||||||
|
<key>LibraryIdentifier</key>
|
||||||
|
<string>tvos-arm64</string>
|
||||||
|
<key>LibraryPath</key>
|
||||||
|
<string>OpenSSL-tvOS.a</string>
|
||||||
|
<key>SupportedArchitectures</key>
|
||||||
|
<array>
|
||||||
|
<string>arm64</string>
|
||||||
|
</array>
|
||||||
|
<key>SupportedPlatform</key>
|
||||||
|
<string>tvos</string>
|
||||||
|
</dict>
|
||||||
|
</array>
|
||||||
|
<key>CFBundlePackageType</key>
|
||||||
|
<string>XFWK</string>
|
||||||
|
<key>XCFrameworkFormatVersion</key>
|
||||||
|
<string>1.0</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+4
-4
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -11,9 +11,7 @@
|
|||||||
#ifndef HEADER_ASN1ERR_H
|
#ifndef HEADER_ASN1ERR_H
|
||||||
# define HEADER_ASN1ERR_H
|
# define HEADER_ASN1ERR_H
|
||||||
|
|
||||||
# ifndef HEADER_SYMHACKS_H
|
# include <openssl/symhacks.h>
|
||||||
# include <openssl/symhacks.h>
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef __cplusplus
|
# ifdef __cplusplus
|
||||||
extern "C"
|
extern "C"
|
||||||
@@ -53,6 +51,7 @@ int ERR_load_ASN1_strings(void);
|
|||||||
# define ASN1_F_ASN1_ITEM_DUP 191
|
# define ASN1_F_ASN1_ITEM_DUP 191
|
||||||
# define ASN1_F_ASN1_ITEM_EMBED_D2I 120
|
# define ASN1_F_ASN1_ITEM_EMBED_D2I 120
|
||||||
# define ASN1_F_ASN1_ITEM_EMBED_NEW 121
|
# define ASN1_F_ASN1_ITEM_EMBED_NEW 121
|
||||||
|
# define ASN1_F_ASN1_ITEM_EX_I2D 144
|
||||||
# define ASN1_F_ASN1_ITEM_FLAGS_I2D 118
|
# define ASN1_F_ASN1_ITEM_FLAGS_I2D 118
|
||||||
# define ASN1_F_ASN1_ITEM_I2D_BIO 192
|
# define ASN1_F_ASN1_ITEM_I2D_BIO 192
|
||||||
# define ASN1_F_ASN1_ITEM_I2D_FP 193
|
# define ASN1_F_ASN1_ITEM_I2D_FP 193
|
||||||
@@ -145,6 +144,7 @@ int ERR_load_ASN1_strings(void);
|
|||||||
# define ASN1_R_ASN1_SIG_PARSE_ERROR 204
|
# define ASN1_R_ASN1_SIG_PARSE_ERROR 204
|
||||||
# define ASN1_R_AUX_ERROR 100
|
# define ASN1_R_AUX_ERROR 100
|
||||||
# define ASN1_R_BAD_OBJECT_HEADER 102
|
# define ASN1_R_BAD_OBJECT_HEADER 102
|
||||||
|
# define ASN1_R_BAD_TEMPLATE 230
|
||||||
# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214
|
# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214
|
||||||
# define ASN1_R_BN_LIB 105
|
# define ASN1_R_BN_LIB 105
|
||||||
# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106
|
# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
@@ -56,7 +56,7 @@ extern "C" {
|
|||||||
* avoid leaking exponent information through timing,
|
* avoid leaking exponent information through timing,
|
||||||
* BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
|
* BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
|
||||||
* BN_div() will call BN_div_no_branch,
|
* BN_div() will call BN_div_no_branch,
|
||||||
* BN_mod_inverse() will call BN_mod_inverse_no_branch.
|
* BN_mod_inverse() will call bn_mod_inverse_no_branch.
|
||||||
*/
|
*/
|
||||||
# define BN_FLG_CONSTTIME 0x04
|
# define BN_FLG_CONSTTIME 0x04
|
||||||
# define BN_FLG_SECURE 0x08
|
# define BN_FLG_SECURE 0x08
|
||||||
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -72,6 +72,7 @@ int ERR_load_BN_strings(void);
|
|||||||
# define BN_F_BN_SET_WORDS 144
|
# define BN_F_BN_SET_WORDS 144
|
||||||
# define BN_F_BN_STACK_PUSH 148
|
# define BN_F_BN_STACK_PUSH 148
|
||||||
# define BN_F_BN_USUB 115
|
# define BN_F_BN_USUB 115
|
||||||
|
# define BN_F_OSSL_BN_RSA_DO_UNBLIND 151
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BN reason codes.
|
* BN reason codes.
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
@@ -187,6 +187,7 @@ int ERR_load_CMS_strings(void);
|
|||||||
# define CMS_R_UNKNOWN_DIGEST_ALGORITHM 149
|
# define CMS_R_UNKNOWN_DIGEST_ALGORITHM 149
|
||||||
# define CMS_R_UNKNOWN_ID 150
|
# define CMS_R_UNKNOWN_ID 150
|
||||||
# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 151
|
# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 151
|
||||||
|
# define CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM 194
|
||||||
# define CMS_R_UNSUPPORTED_CONTENT_TYPE 152
|
# define CMS_R_UNSUPPORTED_CONTENT_TYPE 152
|
||||||
# define CMS_R_UNSUPPORTED_KEK_ALGORITHM 153
|
# define CMS_R_UNSUPPORTED_KEK_ALGORITHM 153
|
||||||
# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM 179
|
# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM 179
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+4
-3
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -241,7 +241,7 @@ typedef UINT64 uint64_t;
|
|||||||
defined(__osf__) || defined(__sgi) || defined(__hpux) || \
|
defined(__osf__) || defined(__sgi) || defined(__hpux) || \
|
||||||
defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
|
defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
|
||||||
# include <inttypes.h>
|
# include <inttypes.h>
|
||||||
# elif defined(_MSC_VER) && _MSC_VER<=1500
|
# elif defined(_MSC_VER) && _MSC_VER<1600
|
||||||
/*
|
/*
|
||||||
* minimally required typdefs for systems not supporting inttypes.h or
|
* minimally required typdefs for systems not supporting inttypes.h or
|
||||||
* stdint.h: currently just older VC++
|
* stdint.h: currently just older VC++
|
||||||
@@ -279,7 +279,8 @@ typedef unsigned __int64 uint64_t;
|
|||||||
# define ossl_inline inline
|
# define ossl_inline inline
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
|
# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
|
||||||
|
!defined(__cplusplus)
|
||||||
# define ossl_noreturn _Noreturn
|
# define ossl_noreturn _Noreturn
|
||||||
# elif defined(__GNUC__) && __GNUC__ >= 2
|
# elif defined(__GNUC__) && __GNUC__ >= 2
|
||||||
# define ossl_noreturn __attribute__((noreturn))
|
# define ossl_noreturn __attribute__((noreturn))
|
||||||
File renamed without changes.
+12
-7
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2002-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
@@ -793,12 +793,15 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
|
|||||||
EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
|
EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
|
||||||
int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
|
int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
|
||||||
|
|
||||||
# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
|
# define d2i_ECPKParameters_bio(bp,x) \
|
||||||
# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
|
ASN1_d2i_bio_of(EC_GROUP, NULL, d2i_ECPKParameters, bp, x)
|
||||||
# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
|
# define i2d_ECPKParameters_bio(bp,x) \
|
||||||
(char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
|
ASN1_i2d_bio_of_const(EC_GROUP, i2d_ECPKParameters, bp, x)
|
||||||
# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
|
# define d2i_ECPKParameters_fp(fp,x) \
|
||||||
(unsigned char *)(x))
|
(EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \
|
||||||
|
(void **)(x))
|
||||||
|
# define i2d_ECPKParameters_fp(fp,x) \
|
||||||
|
ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x))
|
||||||
|
|
||||||
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
|
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
|
||||||
# ifndef OPENSSL_NO_STDIO
|
# ifndef OPENSSL_NO_STDIO
|
||||||
@@ -829,6 +832,8 @@ void EC_KEY_set_flags(EC_KEY *key, int flags);
|
|||||||
|
|
||||||
void EC_KEY_clear_flags(EC_KEY *key, int flags);
|
void EC_KEY_clear_flags(EC_KEY *key, int flags);
|
||||||
|
|
||||||
|
int EC_KEY_decoded_from_explicit_params(const EC_KEY *key);
|
||||||
|
|
||||||
/** Creates a new EC_KEY object using a named curve as underlying
|
/** Creates a new EC_KEY object using a named curve as underlying
|
||||||
* EC_GROUP object.
|
* EC_GROUP object.
|
||||||
* \param nid NID of the named curve.
|
* \param nid NID of the named curve.
|
||||||
File renamed without changes.
File renamed without changes.
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -243,6 +243,7 @@ int ERR_load_EC_strings(void);
|
|||||||
# define EC_R_LADDER_POST_FAILURE 136
|
# define EC_R_LADDER_POST_FAILURE 136
|
||||||
# define EC_R_LADDER_PRE_FAILURE 153
|
# define EC_R_LADDER_PRE_FAILURE 153
|
||||||
# define EC_R_LADDER_STEP_FAILURE 162
|
# define EC_R_LADDER_STEP_FAILURE 162
|
||||||
|
# define EC_R_MISSING_OID 167
|
||||||
# define EC_R_MISSING_PARAMETERS 124
|
# define EC_R_MISSING_PARAMETERS 124
|
||||||
# define EC_R_MISSING_PRIVATE_KEY 125
|
# define EC_R_MISSING_PRIVATE_KEY 125
|
||||||
# define EC_R_NEED_NEW_SETUP_VALUES 157
|
# define EC_R_NEED_NEW_SETUP_VALUES 157
|
||||||
+2
-1
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
|
|||||||
CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
|
CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
|
||||||
fns->mem_fns.realloc_fn, \
|
fns->mem_fns.realloc_fn, \
|
||||||
fns->mem_fns.free_fn); \
|
fns->mem_fns.free_fn); \
|
||||||
|
OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
|
||||||
skip_cbs: \
|
skip_cbs: \
|
||||||
if (!fn(e, id)) return 0; \
|
if (!fn(e, id)) return 0; \
|
||||||
return 1; }
|
return 1; }
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3
-4
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -11,9 +11,7 @@
|
|||||||
#ifndef HEADER_EVPERR_H
|
#ifndef HEADER_EVPERR_H
|
||||||
# define HEADER_EVPERR_H
|
# define HEADER_EVPERR_H
|
||||||
|
|
||||||
# ifndef HEADER_SYMHACKS_H
|
# include <openssl/symhacks.h>
|
||||||
# include <openssl/symhacks.h>
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef __cplusplus
|
# ifdef __cplusplus
|
||||||
extern "C"
|
extern "C"
|
||||||
@@ -179,6 +177,7 @@ int ERR_load_EVP_strings(void);
|
|||||||
# define EVP_R_ONLY_ONESHOT_SUPPORTED 177
|
# define EVP_R_ONLY_ONESHOT_SUPPORTED 177
|
||||||
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
|
# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
|
||||||
# define EVP_R_OPERATON_NOT_INITIALIZED 151
|
# define EVP_R_OPERATON_NOT_INITIALIZED 151
|
||||||
|
# define EVP_R_OUTPUT_WOULD_OVERFLOW 184
|
||||||
# define EVP_R_PARTIALLY_OVERLAPPING 162
|
# define EVP_R_PARTIALLY_OVERLAPPING 162
|
||||||
# define EVP_R_PBKDF2_ERROR 181
|
# define EVP_R_PBKDF2_ERROR 181
|
||||||
# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179
|
# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by crypto/objects/objects.pl
|
* Generated by crypto/objects/objects.pl
|
||||||
*
|
*
|
||||||
* Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
* in the file LICENSE in the source distribution or at
|
* in the file LICENSE in the source distribution or at
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+8
-12
@@ -8,21 +8,17 @@
|
|||||||
|
|
||||||
#include <TargetConditionals.h>
|
#include <TargetConditionals.h>
|
||||||
|
|
||||||
#if TARGET_OS_IOS && TARGET_CPU_X86
|
#if TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64
|
||||||
# include <openssl/opensslconf_ios_i386.h>
|
|
||||||
#elif TARGET_OS_IOS && TARGET_CPU_X86_64
|
|
||||||
# include <openssl/opensslconf_ios_x86_64.h>
|
# include <openssl/opensslconf_ios_x86_64.h>
|
||||||
#elif TARGET_OS_IOS && TARGET_CPU_ARM64
|
#elif TARGET_OS_IOS && (TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR) && TARGET_CPU_ARM64
|
||||||
# include <openssl/opensslconf_ios_arm64.h>
|
# include <openssl/opensslconf_ios_arm64.h>
|
||||||
#elif TARGET_OS_IOS && TARGET_CPU_ARM64E
|
#elif TARGET_OS_IOS && (TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR) && TARGET_CPU_ARM64
|
||||||
# include <openssl/opensslconf_ios_arm64e.h>
|
# include <openssl/opensslconf_ios_arm64.h>
|
||||||
#elif TARGET_OS_IOS && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)
|
#elif TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64
|
||||||
# include <openssl/opensslconf_ios_armv7s.h>
|
|
||||||
#elif TARGET_OS_IOS && TARGET_CPU_ARM && !defined(__ARM_ARCH_7S__)
|
|
||||||
# include <openssl/opensslconf_ios_armv7.h>
|
|
||||||
#elif TARGET_OS_TV && TARGET_CPU_X86_64
|
|
||||||
# include <openssl/opensslconf_tvos_x86_64.h>
|
# include <openssl/opensslconf_tvos_x86_64.h>
|
||||||
#elif TARGET_OS_TV && TARGET_CPU_ARM64
|
#elif TARGET_OS_TV && (TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR) && TARGET_CPU_ARM64
|
||||||
|
# include <openssl/opensslconf_tvos_arm64.h>
|
||||||
|
#elif TARGET_OS_TV && (TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR) && TARGET_CPU_ARM64
|
||||||
# include <openssl/opensslconf_tvos_arm64.h>
|
# include <openssl/opensslconf_tvos_arm64.h>
|
||||||
#else
|
#else
|
||||||
# error Unable to determine target or target not included in OpenSSL build
|
# error Unable to determine target or target not included in OpenSSL build
|
||||||
+6
-1
@@ -2,7 +2,7 @@
|
|||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from include/openssl/opensslconf.h.in
|
* Generated by Makefile from include/openssl/opensslconf.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -130,6 +130,11 @@ extern "C" {
|
|||||||
# undef DECLARE_DEPRECATED
|
# undef DECLARE_DEPRECATED
|
||||||
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
# endif
|
# endif
|
||||||
|
# elif defined(__SUNPRO_C)
|
||||||
|
# if (__SUNPRO_C >= 0x5130)
|
||||||
|
# undef DECLARE_DEPRECATED
|
||||||
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+6
-1
@@ -2,7 +2,7 @@
|
|||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from include/openssl/opensslconf.h.in
|
* Generated by Makefile from include/openssl/opensslconf.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -130,6 +130,11 @@ extern "C" {
|
|||||||
# undef DECLARE_DEPRECATED
|
# undef DECLARE_DEPRECATED
|
||||||
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
# endif
|
# endif
|
||||||
|
# elif defined(__SUNPRO_C)
|
||||||
|
# if (__SUNPRO_C >= 0x5130)
|
||||||
|
# undef DECLARE_DEPRECATED
|
||||||
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+6
-1
@@ -2,7 +2,7 @@
|
|||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from include/openssl/opensslconf.h.in
|
* Generated by Makefile from include/openssl/opensslconf.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -130,6 +130,11 @@ extern "C" {
|
|||||||
# undef DECLARE_DEPRECATED
|
# undef DECLARE_DEPRECATED
|
||||||
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
# endif
|
# endif
|
||||||
|
# elif defined(__SUNPRO_C)
|
||||||
|
# if (__SUNPRO_C >= 0x5130)
|
||||||
|
# undef DECLARE_DEPRECATED
|
||||||
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+6
-1
@@ -2,7 +2,7 @@
|
|||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from include/openssl/opensslconf.h.in
|
* Generated by Makefile from include/openssl/opensslconf.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -130,6 +130,11 @@ extern "C" {
|
|||||||
# undef DECLARE_DEPRECATED
|
# undef DECLARE_DEPRECATED
|
||||||
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
# endif
|
# endif
|
||||||
|
# elif defined(__SUNPRO_C)
|
||||||
|
# if (__SUNPRO_C >= 0x5130)
|
||||||
|
# undef DECLARE_DEPRECATED
|
||||||
|
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -39,8 +39,8 @@ extern "C" {
|
|||||||
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_NUMBER 0x1010106fL
|
# define OPENSSL_VERSION_NUMBER 0x1010114fL
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1t 7 Feb 2023"
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* The macros below are to be used for shared library (.so, .dll, ...)
|
* The macros below are to be used for shared library (.so, .dll, ...)
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+3
-1
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -61,6 +61,7 @@ int ERR_load_PEM_strings(void);
|
|||||||
# define PEM_F_PEM_SIGNFINAL 112
|
# define PEM_F_PEM_SIGNFINAL 112
|
||||||
# define PEM_F_PEM_WRITE 113
|
# define PEM_F_PEM_WRITE 113
|
||||||
# define PEM_F_PEM_WRITE_BIO 114
|
# define PEM_F_PEM_WRITE_BIO 114
|
||||||
|
# define PEM_F_PEM_WRITE_BIO_PRIVATEKEY_TRADITIONAL 147
|
||||||
# define PEM_F_PEM_WRITE_PRIVATEKEY 139
|
# define PEM_F_PEM_WRITE_PRIVATEKEY 139
|
||||||
# define PEM_F_PEM_X509_INFO_READ 115
|
# define PEM_F_PEM_X509_INFO_READ 115
|
||||||
# define PEM_F_PEM_X509_INFO_READ_BIO 116
|
# define PEM_F_PEM_X509_INFO_READ_BIO 116
|
||||||
@@ -99,5 +100,6 @@ int ERR_load_PEM_strings(void);
|
|||||||
# define PEM_R_UNSUPPORTED_CIPHER 113
|
# define PEM_R_UNSUPPORTED_CIPHER 113
|
||||||
# define PEM_R_UNSUPPORTED_ENCRYPTION 114
|
# define PEM_R_UNSUPPORTED_ENCRYPTION 114
|
||||||
# define PEM_R_UNSUPPORTED_KEY_COMPONENTS 126
|
# define PEM_R_UNSUPPORTED_KEY_COMPONENTS 126
|
||||||
|
# define PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE 110
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+12
-2
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||||
* Copyright 2005 Nokia. All rights reserved.
|
* Copyright 2005 Nokia. All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -1305,6 +1305,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
|
|||||||
# define SSL_CTRL_GET_MAX_PROTO_VERSION 131
|
# define SSL_CTRL_GET_MAX_PROTO_VERSION 131
|
||||||
# define SSL_CTRL_GET_SIGNATURE_NID 132
|
# define SSL_CTRL_GET_SIGNATURE_NID 132
|
||||||
# define SSL_CTRL_GET_TMP_KEY 133
|
# define SSL_CTRL_GET_TMP_KEY 133
|
||||||
|
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
|
||||||
|
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
|
||||||
# define SSL_CERT_SET_FIRST 1
|
# define SSL_CERT_SET_FIRST 1
|
||||||
# define SSL_CERT_SET_NEXT 2
|
# define SSL_CERT_SET_NEXT 2
|
||||||
# define SSL_CERT_SET_SERVER 3
|
# define SSL_CERT_SET_SERVER 3
|
||||||
@@ -1360,10 +1362,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
|
|||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
|
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
|
||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
|
||||||
|
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
|
||||||
|
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
|
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
|
||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
|
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
|
||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
|
||||||
|
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
|
||||||
|
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_set0_chain(s,sk) \
|
# define SSL_set0_chain(s,sk) \
|
||||||
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
|
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
|
||||||
# define SSL_set1_chain(s,sk) \
|
# define SSL_set1_chain(s,sk) \
|
||||||
@@ -1386,14 +1392,18 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
|
|||||||
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
|
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_set1_verify_cert_store(s,st) \
|
# define SSL_set1_verify_cert_store(s,st) \
|
||||||
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
|
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
|
||||||
|
#define SSL_get0_verify_cert_store(s,st) \
|
||||||
|
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_set0_chain_cert_store(s,st) \
|
# define SSL_set0_chain_cert_store(s,st) \
|
||||||
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
|
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_set1_chain_cert_store(s,st) \
|
# define SSL_set1_chain_cert_store(s,st) \
|
||||||
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
|
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
|
||||||
|
#define SSL_get0_chain_cert_store(s,st) \
|
||||||
|
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
|
||||||
# define SSL_get1_groups(s, glist) \
|
# define SSL_get1_groups(s, glist) \
|
||||||
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
|
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
|
||||||
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \
|
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \
|
||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(int *)(glist))
|
||||||
# define SSL_CTX_set1_groups_list(ctx, s) \
|
# define SSL_CTX_set1_groups_list(ctx, s) \
|
||||||
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
|
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
|
||||||
# define SSL_set1_groups(s, glist, glistlen) \
|
# define SSL_set1_groups(s, glist, glistlen) \
|
||||||
File renamed without changes.
+4
-1
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
@@ -292,6 +292,9 @@ extern "C" {
|
|||||||
|
|
||||||
# define TLS1_FLAGS_STATELESS 0x0800
|
# define TLS1_FLAGS_STATELESS 0x0800
|
||||||
|
|
||||||
|
/* Set if extended master secret extension required on renegotiation */
|
||||||
|
# define TLS1_FLAGS_REQUIRED_EXTMS 0x1000
|
||||||
|
|
||||||
# define SSL3_MT_HELLO_REQUEST 0
|
# define SSL3_MT_HELLO_REQUEST 0
|
||||||
# define SSL3_MT_CLIENT_HELLO 1
|
# define SSL3_MT_CLIENT_HELLO 1
|
||||||
# define SSL3_MT_SERVER_HELLO 2
|
# define SSL3_MT_SERVER_HELLO 2
|
||||||
+4
-1
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Generated by util/mkerr.pl DO NOT EDIT
|
* Generated by util/mkerr.pl DO NOT EDIT
|
||||||
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@@ -70,6 +70,7 @@ int ERR_load_SSL_strings(void);
|
|||||||
# define SSL_F_FINAL_EMS 486
|
# define SSL_F_FINAL_EMS 486
|
||||||
# define SSL_F_FINAL_KEY_SHARE 503
|
# define SSL_F_FINAL_KEY_SHARE 503
|
||||||
# define SSL_F_FINAL_MAXFRAGMENTLEN 557
|
# define SSL_F_FINAL_MAXFRAGMENTLEN 557
|
||||||
|
# define SSL_F_FINAL_PSK 639
|
||||||
# define SSL_F_FINAL_RENEGOTIATE 483
|
# define SSL_F_FINAL_RENEGOTIATE 483
|
||||||
# define SSL_F_FINAL_SERVER_NAME 558
|
# define SSL_F_FINAL_SERVER_NAME 558
|
||||||
# define SSL_F_FINAL_SIG_ALGS 497
|
# define SSL_F_FINAL_SIG_ALGS 497
|
||||||
@@ -592,6 +593,7 @@ int ERR_load_SSL_strings(void);
|
|||||||
# define SSL_R_MISSING_ECDSA_SIGNING_CERT 381
|
# define SSL_R_MISSING_ECDSA_SIGNING_CERT 381
|
||||||
# define SSL_R_MISSING_FATAL 256
|
# define SSL_R_MISSING_FATAL 256
|
||||||
# define SSL_R_MISSING_PARAMETERS 290
|
# define SSL_R_MISSING_PARAMETERS 290
|
||||||
|
# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310
|
||||||
# define SSL_R_MISSING_RSA_CERTIFICATE 168
|
# define SSL_R_MISSING_RSA_CERTIFICATE 168
|
||||||
# define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169
|
# define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169
|
||||||
# define SSL_R_MISSING_RSA_SIGNING_CERT 170
|
# define SSL_R_MISSING_RSA_SIGNING_CERT 170
|
||||||
@@ -633,6 +635,7 @@ int ERR_load_SSL_strings(void);
|
|||||||
# define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403
|
# define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403
|
||||||
# define SSL_R_NULL_SSL_CTX 195
|
# define SSL_R_NULL_SSL_CTX 195
|
||||||
# define SSL_R_NULL_SSL_METHOD_PASSED 196
|
# define SSL_R_NULL_SSL_METHOD_PASSED 196
|
||||||
|
# define SSL_R_OCSP_CALLBACK_FAILURE 294
|
||||||
# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197
|
# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197
|
||||||
# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
|
# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
|
||||||
# define SSL_R_OVERFLOW_ERROR 237
|
# define SSL_R_OVERFLOW_ERROR 237
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 448 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user