Skip to content

Commit c1d920a

Browse files
committed
Update OpenSSL 1.1.1n
1 parent 4ae145c commit c1d920a

File tree

25 files changed

+25
-20
lines changed

25 files changed

+25
-20
lines changed

OpenSSL-Universal.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OpenSSL-Universal"
3-
s.version = "1.1.1300" # 1.1.1m
3+
s.version = "1.1.1400" # 1.1.1n
44
s.summary = "OpenSSL for iOS and OS X"
55
s.description = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in Mac OS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports OSX and iOS including Simulator (armv7,armv7s,arm64,x86_64)."
66
s.homepage = "https://github.com/krzyzanowskim/OpenSSL"

OpenSSL.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"1.1.1400": "https://github.com/krzyzanowskim/OpenSSL/releases/download/1.1.1400/OpenSSL.xcframework.zip",
23
"1.1.1300": "https://github.com/krzyzanowskim/OpenSSL/releases/download/1.1.1300/OpenSSL.xcframework.zip",
34
"1.1.1200": "https://github.com/krzyzanowskim/OpenSSL/releases/download/1.1.1200/OpenSSL.xcframework.zip",
45
"1.1.180": "https://github.com/krzyzanowskim/OpenSSL/releases/download/1.1.180/OpenSSL.xcframework.zip"

OpenSSL.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ LD_VERIFY_BITCODE = YES
1919
PBXCP_BITCODE_STRIP_MODE = none
2020
PBXCP_STRIP_BITCODE = NO
2121

22-
MARKETING_VERSION = 1.1.1300
22+
MARKETING_VERSION = 1.1.1400

config/20-apple.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ my %targets = ();
2323

2424
"mac-catalyst-x86_64" => {
2525
inherit_from => [ "darwin64-x86_64-cc", "mac-catalyst-cross-base" ],
26-
cflags => add("-target x86_64-apple-ios13.0-macabi"),
26+
cflags => add("-target x86_64-apple-ios14.0-macabi"),
2727
disable => [ "engine", "async" ],
2828
sys_id => "MacOSX",
2929
},

iphoneos/include/openssl/engine.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
44
*
55
* 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,
722722
CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
723723
fns->mem_fns.realloc_fn, \
724724
fns->mem_fns.free_fn); \
725+
OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
725726
skip_cbs: \
726727
if (!fn(e, id)) return 0; \
727728
return 1; }

0 commit comments

Comments
 (0)