diff options
Diffstat (limited to 'src/lib/libcrypto/evp/m_dss1.c')
-rw-r--r-- | src/lib/libcrypto/evp/m_dss1.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/src/lib/libcrypto/evp/m_dss1.c b/src/lib/libcrypto/evp/m_dss1.c index a010103b7a..2d9feff095 100644 --- a/src/lib/libcrypto/evp/m_dss1.c +++ b/src/lib/libcrypto/evp/m_dss1.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 |
@@ -69,16 +69,21 @@ | |||
69 | #endif | 69 | #endif |
70 | 70 | ||
71 | static int init(EVP_MD_CTX *ctx) | 71 | static int init(EVP_MD_CTX *ctx) |
72 | { return SHA1_Init(ctx->md_data); } | 72 | { |
73 | return SHA1_Init(ctx->md_data); | ||
74 | } | ||
73 | 75 | ||
74 | static int update(EVP_MD_CTX *ctx,const void *data,size_t count) | 76 | static int update(EVP_MD_CTX *ctx, const void *data, size_t count) |
75 | { return SHA1_Update(ctx->md_data,data,count); } | 77 | { |
78 | return SHA1_Update(ctx->md_data, data, count); | ||
79 | } | ||
76 | 80 | ||
77 | static int final(EVP_MD_CTX *ctx,unsigned char *md) | 81 | static int final(EVP_MD_CTX *ctx, unsigned char *md) |
78 | { return SHA1_Final(md,ctx->md_data); } | 82 | { |
83 | return SHA1_Final(md, ctx->md_data); | ||
84 | } | ||
79 | 85 | ||
80 | static const EVP_MD dss1_md= | 86 | static const EVP_MD dss1_md = { |
81 | { | ||
82 | NID_dsa, | 87 | NID_dsa, |
83 | NID_dsaWithSHA1, | 88 | NID_dsaWithSHA1, |
84 | SHA_DIGEST_LENGTH, | 89 | SHA_DIGEST_LENGTH, |
@@ -90,11 +95,12 @@ static const EVP_MD dss1_md= | |||
90 | NULL, | 95 | NULL, |
91 | EVP_PKEY_DSA_method, | 96 | EVP_PKEY_DSA_method, |
92 | SHA_CBLOCK, | 97 | SHA_CBLOCK, |
93 | sizeof(EVP_MD *)+sizeof(SHA_CTX), | 98 | sizeof(EVP_MD *) + sizeof(SHA_CTX), |
94 | }; | 99 | }; |
95 | 100 | ||
96 | const EVP_MD *EVP_dss1(void) | 101 | const EVP_MD * |
97 | { | 102 | EVP_dss1(void) |
98 | return(&dss1_md); | 103 | { |
99 | } | 104 | return (&dss1_md); |
105 | } | ||
100 | #endif | 106 | #endif |