Skip to content

Commit

Permalink
Exclude arch opensslconf from the umbrella header
Browse files Browse the repository at this point in the history
  • Loading branch information
@krzyzanowskim
krzyzanowskim committed Apr 14, 2019
1 parent 45596a7 commit b69bdf0
Show file tree
Hide file tree
Showing 21 changed files with 35 additions and 39 deletions.
Binary file modified Frameworks/ios/OpenSSL.framework/OpenSSL
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions Frameworks/ios/OpenSSL.framework/Versions/A/Headers/OpenSSL.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
#include "obj_mac.h"
#include "objects.h"
#include "ocsp.h"
#include "opensslconf-arm64.h"
#include "opensslconf-armv7.h"
#include "opensslconf-armv7s.h"
#include "opensslconf-x86_64.h"
#include "opensslconf.h"
#include "opensslv.h"
#include "ossl_typ.h"
Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Versions/A/Headers/opensslconf-arm64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-arm64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-arm64/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Versions/A/Headers/opensslconf-armv7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Versions/A/Headers/opensslconf-armv7s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7s/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7s/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Frameworks/ios/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-x86_64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-x86_64/ssl"
#endif
#endif

Expand Down
20 changes: 10 additions & 10 deletions Frameworks/ios/OpenSSL.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<dict>
<key>hash</key>
<data>
gwccyKiXRvgSa2ngpGWKCDC75R4=
ZGDxm1MyS5K6oX0Pj23so1Rf0bY=
</data>
<key>hash2</key>
<data>
a/+BK+zQnRFWMkDZUqHzfmQ87PiUj+uXjySLWGHfjvo=
sWgttK6IlUE/ZgV/yU9JkE0m5FHnIZV5qdxzkTJSvmQ=
</data>
</dict>
<key>Versions/A/Headers/aes.h</key>
Expand Down Expand Up @@ -498,44 +498,44 @@
<dict>
<key>hash</key>
<data>
AOgtd3y8CDOb6q+FwmqkHIiPbiQ=
v+0uHMK9qDAleK0klIocmfJl5FU=
</data>
<key>hash2</key>
<data>
dx4EPlzjTaHzGezo8M+rC/dFbybcwJOpIhMQdA+7BSs=
TKzFxNdp76J+gKP+RP5qJVKj5lNrncrfA5mk8FlxVM8=
</data>
</dict>
<key>Versions/A/Headers/opensslconf-armv7.h</key>
<dict>
<key>hash</key>
<data>
MK1GE2mL04pr9hnI8ZrI9Iup4i8=
riLR9BEvQ+5cSullGffJ5xkEnf0=
</data>
<key>hash2</key>
<data>
ReKxLpgn2YDTQ23RH20xo+Cx4fpJP5C7WkwHhfFqfOQ=
AqcsBbbu68LdeK6RxIIp7wQS3VCkVCxdgM6OThd+0xM=
</data>
</dict>
<key>Versions/A/Headers/opensslconf-armv7s.h</key>
<dict>
<key>hash</key>
<data>
ZYUou5zU1pWKb1yrtZWSl58OL8I=
AUTsupYqqR5XUY9mZTVNtHL8HDI=
</data>
<key>hash2</key>
<data>
bMxyJWY8g7KEtW+/qiZi2cupoPVD7gOIDIVEJdo9ODU=
gtKEV56r5hNghRieGAVZiSKb3yZHJXyZ7zGfF1RQCRY=
</data>
</dict>
<key>Versions/A/Headers/opensslconf-x86_64.h</key>
<dict>
<key>hash</key>
<data>
2Cf7pBeiHe8+0WgrI+cC5olkY3Q=
Gzia1CX1SEYIOuPYoQ5xEFX2VCg=
</data>
<key>hash2</key>
<data>
2j8I5TmErSW4+CNKpNHu/dwReFTcfmh3wchpdZAtZj0=
hIWaEfVdQCwGm3bOkxNlYVIoVXV9YUeoNLUjQaPBn0k=
</data>
</dict>
<key>Versions/A/Headers/opensslconf.h</key>
Expand Down
Binary file modified Frameworks/macos/OpenSSL.framework/OpenSSL
View file
Binary file not shown.
1 change: 0 additions & 1 deletion Frameworks/macos/OpenSSL.framework/Versions/A/Headers/OpenSSL.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include "obj_mac.h"
#include "objects.h"
#include "ocsp.h"
#include "opensslconf-x86_64.h"
#include "opensslconf.h"
#include "opensslv.h"
#include "ossl_typ.h"
Expand Down
4 changes: 2 additions & 2 deletions Frameworks/macos/OpenSSL.framework/Versions/A/Headers/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.08Tq1gHp/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.08Tq1gHp/1.0.2r-x86_64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.dCTOMxOY/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.dCTOMxOY/1.0.2r-x86_64/ssl"
#endif
#endif

Expand Down
8 changes: 4 additions & 4 deletions Frameworks/macos/OpenSSL.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<dict>
<key>hash</key>
<data>
Kjmf46Bznpvl+M0IawzeK0KDmao=
ZGDxm1MyS5K6oX0Pj23so1Rf0bY=
</data>
<key>hash2</key>
<data>
uTh5L9LL8+B+l/7KH/xSRHvk4smTxZnAWL/pY83/6Ek=
sWgttK6IlUE/ZgV/yU9JkE0m5FHnIZV5qdxzkTJSvmQ=
</data>
</dict>
<key>Versions/A/Headers/aes.h</key>
Expand Down Expand Up @@ -498,11 +498,11 @@
<dict>
<key>hash</key>
<data>
EZdDvmdNBYJe74MyWeuiXAODvn4=
bWZa3XNxNxFeeXu1J2ajS6uqY4Q=
</data>
<key>hash2</key>
<data>
jd9ASwRcqrF9dweLD8gng2J8Ypip0CD7jUzjLwGsjd0=
pgjCaCEgThyiHxhW6QsjoouPn+dVUhnmxp83Ox6EIBo=
</data>
</dict>
<key>Versions/A/Headers/opensslconf.h</key>
Expand Down
1 change: 1 addition & 0 deletions create-framework.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ create_module() {
for header in $fw_path/Headers/*
do
header=$(basename $header)
[[ "$header" = opensslconf-* ]] && continue
[ "$header" = "$FWNAME.h" ] && continue
[ "$header" = "ssl.h" ] && continue
echo "#include \"$header\"" >> $fw_path/Headers/$FWNAME.h
Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-arm64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-arm64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-arm64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-arm64/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-armv7.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-armv7s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-armv7s/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7s/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-armv7s/ssl"
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions ios/include/openssl/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.HZIYk6Ri/1.0.2r-x86_64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.ZGAk08Lr/1.0.2r-x86_64/ssl"
#endif
#endif

Expand Down
Binary file modified ios/lib/libcrypto.a
View file
Binary file not shown.
Binary file modified ios/lib/libssl.a
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions macos/include/openssl/opensslconf-x86_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ extern "C" {

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.08Tq1gHp/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.08Tq1gHp/1.0.2r-x86_64/ssl"
#define ENGINESDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.dCTOMxOY/1.0.2r-x86_64/lib/engines"
#define OPENSSLDIR "/var/folders/hl/5lwrrzrx20d2h38qww1kr9x80000gn/T/tmp.dCTOMxOY/1.0.2r-x86_64/ssl"
#endif
#endif

Expand Down
Binary file modified macos/lib/libcrypto.a
View file
Binary file not shown.
Binary file modified macos/lib/libssl.a
View file
Binary file not shown.

0 comments on commit b69bdf0

Please sign in to comment.