diff options
Diffstat (limited to 'src/lib/libcrypto/evp/m_sha.c')
-rw-r--r-- | src/lib/libcrypto/evp/m_sha.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/src/lib/libcrypto/evp/m_sha.c b/src/lib/libcrypto/evp/m_sha.c index 8769cdd42f..d2d275f833 100644 --- a/src/lib/libcrypto/evp/m_sha.c +++ b/src/lib/libcrypto/evp/m_sha.c | |||
@@ -5,21 +5,21 @@ | |||
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 |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
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 |
@@ -70,16 +70,21 @@ | |||
70 | #include "evp_locl.h" | 70 | #include "evp_locl.h" |
71 | 71 | ||
72 | static int init(EVP_MD_CTX *ctx) | 72 | static int init(EVP_MD_CTX *ctx) |
73 | { return SHA_Init(ctx->md_data); } | 73 | { |
74 | return SHA_Init(ctx->md_data); | ||
75 | } | ||
74 | 76 | ||
75 | static int update(EVP_MD_CTX *ctx,const void *data,size_t count) | 77 | static int update(EVP_MD_CTX *ctx, const void *data, size_t count) |
76 | { return SHA_Update(ctx->md_data,data,count); } | 78 | { |
79 | return SHA_Update(ctx->md_data, data, count); | ||
80 | } | ||
77 | 81 | ||
78 | static int final(EVP_MD_CTX *ctx,unsigned char *md) | 82 | static int final(EVP_MD_CTX *ctx, unsigned char *md) |
79 | { return SHA_Final(md,ctx->md_data); } | 83 | { |
84 | return SHA_Final(md, ctx->md_data); | ||
85 | } | ||
80 | 86 | ||
81 | static const EVP_MD sha_md= | 87 | static const EVP_MD sha_md = { |
82 | { | ||
83 | NID_sha, | 88 | NID_sha, |
84 | NID_shaWithRSAEncryption, | 89 | NID_shaWithRSAEncryption, |
85 | SHA_DIGEST_LENGTH, | 90 | SHA_DIGEST_LENGTH, |
@@ -91,11 +96,12 @@ static const EVP_MD sha_md= | |||
91 | NULL, | 96 | NULL, |
92 | EVP_PKEY_RSA_method, | 97 | EVP_PKEY_RSA_method, |
93 | SHA_CBLOCK, | 98 | SHA_CBLOCK, |
94 | sizeof(EVP_MD *)+sizeof(SHA_CTX), | 99 | sizeof(EVP_MD *) + sizeof(SHA_CTX), |
95 | }; | 100 | }; |
96 | 101 | ||
97 | const EVP_MD *EVP_sha(void) | 102 | const EVP_MD * |
98 | { | 103 | EVP_sha(void) |
99 | return(&sha_md); | 104 | { |
100 | } | 105 | return (&sha_md); |
106 | } | ||
101 | #endif | 107 | #endif |