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

Unified Diff: openssl/crypto/bf/bf_skey.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « openssl/crypto/bf/asm/bf-586.pl ('k') | openssl/crypto/bf/blowfish.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl/crypto/bf/bf_skey.c
===================================================================
--- openssl/crypto/bf/bf_skey.c (revision 105093)
+++ openssl/crypto/bf/bf_skey.c (working copy)
@@ -59,15 +59,10 @@
#include <stdio.h>
#include <string.h>
#include <openssl/blowfish.h>
-#include <openssl/crypto.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
-
#include "bf_locl.h"
#include "bf_pi.h"
-FIPS_NON_FIPS_VCIPHER_Init(BF)
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
{
int i;
BF_LONG *p,ri,in[2];
« no previous file with comments | « openssl/crypto/bf/asm/bf-586.pl ('k') | openssl/crypto/bf/blowfish.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698