Skip to content

Upgrade to openssl-1.0.2a (Part1) #1325

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

Closed
wants to merge 6 commits into from
Closed

Upgrade to openssl-1.0.2a (Part1) #1325

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80da54c
deps: update gyp to e1c8fcf7
Mar 30, 2015
107a68b
gyp: fix build with python 2.6
indutny Jan 13, 2014
91f36d0
tools: fix gyp to work on MacOSX without XCode
Feb 10, 2015
ebc75f5
deps: refactor openssl.gyp
Feb 3, 2015
12f72b5
benchmark: add/remove hash algorithm
Apr 2, 2015
6b3c90c
benchmark: add rsa/aes-gcm performance test
Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gyp: fix build with python 2.6 
fix #6859
  • Loading branch information
@indutny
indutny authored and Shigeki Ohtsu committed Apr 2, 2015
commit 107a68b40d9fc4aa00b1261017445ea1bd98ce4d
3 changes: 2 additions & 1 deletion tools/gyp/pylib/gyp/mac_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,8 @@ def _ExpandVariables(self, data, substitutions):
if isinstance(data, list):
return [self._ExpandVariables(v, substitutions) for v in data]
if isinstance(data, dict):
return {k: self._ExpandVariables(data[k], substitutions) for k in data}
return dict((k, self._ExpandVariables(data[k],
substitutions)) for k in data)
return data

if __name__ == '__main__':
Expand Down