diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/pem/pem_sign.c | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c index cbd3cd0793..ab3e5ebc64 100644 --- a/src/lib/libcrypto/pem/pem_sign.c +++ b/src/lib/libcrypto/pem/pem_sign.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 |
@@ -64,39 +64,43 @@ | |||
64 | #include <openssl/x509.h> | 64 | #include <openssl/x509.h> |
65 | #include <openssl/pem.h> | 65 | #include <openssl/pem.h> |
66 | 66 | ||
67 | void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) | 67 | void |
68 | { | 68 | PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) |
69 | { | ||
69 | EVP_DigestInit_ex(ctx, type, NULL); | 70 | EVP_DigestInit_ex(ctx, type, NULL); |
70 | } | 71 | } |
71 | 72 | ||
72 | void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data, | 73 | void |
73 | unsigned int count) | 74 | PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data, |
74 | { | 75 | unsigned int count) |
75 | EVP_DigestUpdate(ctx,data,count); | 76 | { |
76 | } | 77 | EVP_DigestUpdate(ctx, data, count); |
78 | } | ||
77 | 79 | ||
78 | int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, | 80 | int |
79 | EVP_PKEY *pkey) | 81 | PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, |
80 | { | 82 | EVP_PKEY *pkey) |
83 | { | ||
81 | unsigned char *m; | 84 | unsigned char *m; |
82 | int i,ret=0; | 85 | int i, ret = 0; |
83 | unsigned int m_len; | 86 | unsigned int m_len; |
84 | 87 | ||
85 | m=(unsigned char *)malloc(EVP_PKEY_size(pkey)+2); | 88 | m = (unsigned char *)malloc(EVP_PKEY_size(pkey) + 2); |
86 | if (m == NULL) | 89 | if (m == NULL) { |
87 | { | 90 | PEMerr(PEM_F_PEM_SIGNFINAL, ERR_R_MALLOC_FAILURE); |
88 | PEMerr(PEM_F_PEM_SIGNFINAL,ERR_R_MALLOC_FAILURE); | 91 | goto err; |
92 | } | ||
93 | |||
94 | if (EVP_SignFinal(ctx, m,&m_len, pkey) <= 0) | ||
89 | goto err; | 95 | goto err; |
90 | } | ||
91 | 96 | ||
92 | if (EVP_SignFinal(ctx,m,&m_len,pkey) <= 0) goto err; | 97 | i = EVP_EncodeBlock(sigret, m, m_len); |
98 | *siglen = i; | ||
99 | ret = 1; | ||
93 | 100 | ||
94 | i=EVP_EncodeBlock(sigret,m,m_len); | ||
95 | *siglen=i; | ||
96 | ret=1; | ||
97 | err: | 101 | err: |
98 | /* ctx has been zeroed by EVP_SignFinal() */ | 102 | /* ctx has been zeroed by EVP_SignFinal() */ |
99 | if (m != NULL) free(m); | 103 | if (m != NULL) |
100 | return(ret); | 104 | free(m); |
101 | } | 105 | return (ret); |
102 | 106 | } | |