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.

Sign up for GitHub

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

Jump to bottom

[SqueakSSL] Overlay OpenSSL for linux/unix #205

Merged
merged 4 commits into from Jan 31, 2018
Merged

[SqueakSSL] Overlay OpenSSL for linux/unix #205

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49353ed
[SqueakSSL] Overlay OpenSSL for linux/unix
krono Jan 30, 2018
8e48e6f
Allow for possibly undefined X509 constant
krono Jan 30, 2018
438311c
Refactor the overlay, comments where due
krono Jan 31, 2018
74e443c
Nit picks [ci skip]
fniephaus Jan 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions platforms/unix/plugins/SqueakSSL/openssl_overlay.h
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* CONTENT: Overlay OpenSSL for Linux/Unix
*
* AUTHORS: Tobias Pape (topa)
* Hasso Plattner Institute, Postdam, Germany
* Hasso Plattner Institute, Potsdam, Germany
*****************************************************************************
* When we dynamically link against OpenSSL, the bundles are not
* portable, as CentOS and friends use other SO_NAMEs than Debian and
Expand All @@ -33,7 +33,7 @@
*
* SQO_DECL___(RETURN_TYPE, NAME, ARGS...)
*
* For symbols that appeard first version XYZ (X >=1) use SQO_DECLXYZ,
* For symbols that appeared first version XYZ (X >=1) use SQO_DECLXYZ,
* for example:
*
* SQO_DECL102 (Available since OpenSSL 1.0.2)
Expand Down Expand Up @@ -130,7 +130,7 @@
* List of optional OpenSSL constants
*
* This is necessary to allow usage of those constants with newer
* dyamically loaded libraries, but whlist using older versions at
* dynamically loaded libraries, but whilst using older versions at
* compile time.
*/
#if defined(X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS)
Expand Down Expand Up @@ -169,8 +169,8 @@
*
* The following stanzas will do this:
*
* * When compiling non-linked (dynmically loaded):
* * find dl-header, define helper marcos for symbol lookup
* * When compiling non-linked (dynamically loaded):
* * find dl-header, define helper macros for symbol lookup
* * define static handles for dynamic libraries
* * helper function that does actual lookup
* * helper function that unloads libraries on SqueakSSL unload
Expand All @@ -181,7 +181,7 @@
* * When compiling linked (not dynamically loaded):
* * alias all necessary OpenSSL symbols to sqo_ prefixed
* * otherwise, when compiling non-linked (dynamically loaded):
* * lookup every symbol and assing to sqo_ prefixed name
* * lookup every symbol and assign to sqo_ prefixed name
*
* That's it, essentially.
*/
Expand Down Expand Up @@ -232,7 +232,7 @@ void SQO_DESTRUCTOR fini(void)
* Macro that lookups a symbol in a library and does immediately
* return the address when found.
*
* (whith optional debug output)
* (with optional debug output)
*/
#if (defined(DEBUG) || defined(DEBUGVM)) && !defined(NDEBUG)
#define SQO_HAS_FOUND_SYM(s,n,h) \
Expand Down Expand Up @@ -319,7 +319,7 @@ SQO_DECLARATIONS
* true when all required symbols could be loaded/are linked
* false when at least one required symbol could not be loaded
*
* Call this exaclty once!
* Call this exactly once!
*/
bool loadLibrary(void)
{
Expand Down