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

Side by Side Diff: openssl/crypto/conf/conf_mall.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/conf/conf_lib.c ('k') | openssl/crypto/conf/conf_mod.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 /* conf_mall.c */ 1 /* conf_mall.c */
2 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL 2 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
5 /* ==================================================================== 5 /* ====================================================================
6 * Copyright (c) 2001 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 2001 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 * 56 *
57 */ 57 */
58 58
59 #include <stdio.h> 59 #include <stdio.h>
60 #include <openssl/crypto.h> 60 #include <openssl/crypto.h>
61 #include "cryptlib.h" 61 #include "cryptlib.h"
62 #include <openssl/conf.h> 62 #include <openssl/conf.h>
63 #include <openssl/dso.h> 63 #include <openssl/dso.h>
64 #include <openssl/x509.h> 64 #include <openssl/x509.h>
65 #include <openssl/asn1.h> 65 #include <openssl/asn1.h>
66 #include <openssl/evp.h>
67 #ifndef OPENSSL_NO_ENGINE 66 #ifndef OPENSSL_NO_ENGINE
68 #include <openssl/engine.h> 67 #include <openssl/engine.h>
69 #endif 68 #endif
70 69
71 /* Load all OpenSSL builtin modules */ 70 /* Load all OpenSSL builtin modules */
72 71
73 void OPENSSL_load_builtin_modules(void) 72 void OPENSSL_load_builtin_modules(void)
74 { 73 {
75 /* Add builtin modules here */ 74 /* Add builtin modules here */
76 ASN1_add_oid_module(); 75 ASN1_add_oid_module();
77 #ifndef OPENSSL_NO_ENGINE 76 #ifndef OPENSSL_NO_ENGINE
78 ENGINE_add_conf_module(); 77 ENGINE_add_conf_module();
79 #endif 78 #endif
80 EVP_add_alg_module();
81 } 79 }
82 80
OLDNEW
« no previous file with comments | « openssl/crypto/conf/conf_lib.c ('k') | openssl/crypto/conf/conf_mod.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698