Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Side by Side Diff: openssl/crypto/dso/dso_openssl.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/dso/dso_null.c ('k') | openssl/crypto/dso/dso_vms.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* dso_openssl.c */ 1 /* dso_openssl.c */
2 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
5 /* ==================================================================== 5 /* ====================================================================
6 * Copyright (c) 2000 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #ifdef DEF_DSO_METHOD 67 #ifdef DEF_DSO_METHOD
68 return(DEF_DSO_METHOD()); 68 return(DEF_DSO_METHOD());
69 #elif defined(DSO_DLFCN) 69 #elif defined(DSO_DLFCN)
70 return(DSO_METHOD_dlfcn()); 70 return(DSO_METHOD_dlfcn());
71 #elif defined(DSO_DL) 71 #elif defined(DSO_DL)
72 return(DSO_METHOD_dl()); 72 return(DSO_METHOD_dl());
73 #elif defined(DSO_WIN32) 73 #elif defined(DSO_WIN32)
74 return(DSO_METHOD_win32()); 74 return(DSO_METHOD_win32());
75 #elif defined(DSO_VMS) 75 #elif defined(DSO_VMS)
76 return(DSO_METHOD_vms()); 76 return(DSO_METHOD_vms());
77 #elif defined(DSO_BEOS)
78 return(DSO_METHOD_beos());
77 #else 79 #else
78 return(DSO_METHOD_null()); 80 return(DSO_METHOD_null());
79 #endif 81 #endif
80 } 82 }
81 83
OLDNEW
« no previous file with comments | « openssl/crypto/dso/dso_null.c ('k') | openssl/crypto/dso/dso_vms.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698