Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OpenSSL to version 1.0.2g #4329

Merged
merged 1 commit into from
Apr 18, 2016
Merged

Conversation

mrezai
Copy link
Contributor

@mrezai mrezai commented Apr 15, 2016

Update to latest stable version. All Makefile files, Perl files(.pl), Assembly files(.s, *.S) and test files(test) removed.
Please see #4275 last comment for more information.

@akien-mga
Copy link
Member

akien-mga commented Apr 18, 2016

Thanks a lot! I checked the patch locally and it builds and seems to run fine. I also compared the files to those of the upstream 1.0.2g (mostly to check for potential forgotten or leftover files, etc.).

I found some diffs which I remember from earlier "bugfix" commits, so thumbs up for keep their changes. I think most of them are due to us not defining OPENSSL_SYS_WIN32 for Windows builds, that's probably something to look into so that we can drop our patches. (All diffs renamed to .txt as GH won't access .diff files)

opensslconf.h is likely what we need to work on if we want to drop our patches.

I'll check for potential obsolete files/missing files and merge.

@akien-mga
Copy link
Member

Files that we have and that are not in the upstream tarball:

$ for file in $(cat files_list.txt); do   filename=$(basename $file); matches=$(find /home/akien/tmp/openssl/openssl-1.0.2g/ -type f -name $filename); if [ -z "$matches" ]; then echo "No match for $file"; fi; done
No match for builtin_openssl2/nocpuid.c
No match for builtin_openssl2/SCsub
No match for builtin_openssl2/crypto/des/t/test

All good.

Code files (.c and .h) that the upstream tarballs has and our repo doesn't:

$ for file in $(find /home/akien/tmp/openssl/openssl-1.0.2g -type f -name "*.c" -o -name "*.h"); do   filename=$(basename $file); matches=$(find builtin_openssl2/ -type f -name $filename); if [ -z "$matches" ]; then echo "No match for $file" >> nomatch.txt; fi; done

This gives some output due to the other folders in the upstream tarball (apps, demos, engines, etc.), and some .*test.c files in crypto and ssl, but after filtering these out it's all good. So once again nice job @mrezai :D

@akien-mga akien-mga merged commit 206895a into godotengine:master Apr 18, 2016
@akien-mga akien-mga added this to the 2.1 milestone May 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants