diff options
author | Geremy Condra <gcondra@google.com> | 2012-04-19 13:47:57 -0700 |
---|---|---|
committer | Geremy Condra <gcondra@google.com> | 2012-04-19 15:26:17 -0700 |
commit | b1fde5cd7d5158b8e6876139ca76a341d0e49708 (patch) | |
tree | d613a91e167b15387d5c6bb5a2fc37de6aeaa71f /libc/sha.h | |
parent | d3271024770ddcc2fb87dd22f8280764545ab05a (diff) | |
download | legacy-b1fde5cd7d5158b8e6876139ca76a341d0e49708.tar.gz |
Moves us from e=3 to e=65537android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-dev
This is designed to increase our resistance to key recovery and
bring us closer to the version of libmincrypt used elsewhere in
Google.
Change-Id: I9a7d9dc78956686bd898c3587e7cb40c231fc520
Diffstat (limited to 'libc/sha.h')
-rw-r--r-- | libc/sha.h | 54 |
1 files changed, 16 insertions, 38 deletions
@@ -1,30 +1,5 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ +// Copyright 2008 Google Inc. All Rights Reserved. +// Author: mschilder@google.com (Marius Schilder) #ifndef _EMBEDDED_SHA_H_ #define _EMBEDDED_SHA_H_ @@ -33,25 +8,28 @@ #ifdef __cplusplus extern "C" { -#endif +#endif // __cplusplus typedef struct SHA_CTX { - uint64_t count; - uint8_t buf[64]; - uint32_t state[5]; + uint64_t count; + uint32_t state[5]; + union { + uint8_t b[64]; + uint32_t w[16]; + } buf; } SHA_CTX; -void SHA_init(SHA_CTX *ctx); -void SHA_update(SHA_CTX *ctx, const void* data, int len); -const uint8_t* SHA_final(SHA_CTX *ctx); +void SHA_init(SHA_CTX* ctx); +void SHA_update(SHA_CTX* ctx, const void* data, int len); +const uint8_t* SHA_final(SHA_CTX* ctx); -/* Convenience method. Returns digest parameter value. */ -const uint8_t* SHA(const void *data, int len, uint8_t *digest); +// Convenience method. Returns digest parameter value. +const uint8_t* SHA(const void* data, int len, uint8_t* digest); #define SHA_DIGEST_SIZE 20 #ifdef __cplusplus } -#endif +#endif // __cplusplus -#endif +#endif // _EMBEDDED_SHA_H_ |