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

Side by Side Diff: openssl/crypto/seed/seed.h

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/seed/Makefile ('k') | openssl/crypto/seed/seed.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 /* 1 /*
2 * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserv ed. 2 * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Neither the name of author nor the names of its contributors may 9 * 2. Neither the name of author nor the names of its contributors may
10 * be used to endorse or promote products derived from this software 10 * be used to endorse or promote products derived from this software
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 * (eay@cryptsoft.com). This product includes software written by Tim 75 * (eay@cryptsoft.com). This product includes software written by Tim
76 * Hudson (tjh@cryptsoft.com). 76 * Hudson (tjh@cryptsoft.com).
77 * 77 *
78 */ 78 */
79 79
80 80
81 #ifndef HEADER_SEED_H 81 #ifndef HEADER_SEED_H
82 #define HEADER_SEED_H 82 #define HEADER_SEED_H
83 83
84 #include <openssl/opensslconf.h> 84 #include <openssl/opensslconf.h>
85 #include <openssl/e_os2.h>
86 #include <openssl/crypto.h>
85 87
86 #ifdef OPENSSL_NO_SEED 88 #ifdef OPENSSL_NO_SEED
87 #error SEED is disabled. 89 #error SEED is disabled.
88 #endif 90 #endif
89 91
90 #ifdef AES_LONG /* look whether we need 'long' to get 32 bits */ 92 #ifdef AES_LONG /* look whether we need 'long' to get 32 bits */
91 # ifndef SEED_LONG 93 # ifndef SEED_LONG
92 # define SEED_LONG 1 94 # define SEED_LONG 1
93 # endif 95 # endif
94 #endif 96 #endif
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out, 128 void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
127 size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_S IZE], int *num, int enc); 129 size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_S IZE], int *num, int enc);
128 void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out, 130 void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
129 size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_S IZE], int *num); 131 size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_S IZE], int *num);
130 132
131 #ifdef __cplusplus 133 #ifdef __cplusplus
132 } 134 }
133 #endif 135 #endif
134 136
135 #endif /* HEADER_SEED_H */ 137 #endif /* HEADER_SEED_H */
OLDNEW
« no previous file with comments | « openssl/crypto/seed/Makefile ('k') | openssl/crypto/seed/seed.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698