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

Side by Side Diff: openssl/crypto/sha/sha_dgst.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/sha/sha512.c ('k') | openssl/crypto/sha/sha_locl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/sha/sha1dgst.c */ 1 /* crypto/sha/sha1dgst.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * The licence and distribution terms for any publically available version or 53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59 #include <openssl/opensslconf.h> 59 #include <openssl/opensslconf.h>
60 #include <openssl/crypto.h>
61 #ifdef OPENSSL_FIPS
62 #include <openssl/fips.h>
63 #endif
64
65 #include <openssl/err.h>
66 #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA) 60 #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
67 61
68 #undef SHA_1 62 #undef SHA_1
69 #define SHA_0 63 #define SHA_0
70 64
71 #include <openssl/opensslv.h> 65 #include <openssl/opensslv.h>
72 66
73 const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT; 67 const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT;
74 68
75 /* The implementation is in ../md32_common.h */ 69 /* The implementation is in ../md32_common.h */
76 70
77 #include "sha_locl.h" 71 #include "sha_locl.h"
78 72
79 #endif 73 #endif
80 74
OLDNEW
« no previous file with comments | « openssl/crypto/sha/sha512.c ('k') | openssl/crypto/sha/sha_locl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698