summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_mutl.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_mutl.c113
1 files changed, 64 insertions, 49 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index 203480fb15..7a2fab1666 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_mutl.c,v 1.13 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: p12_mutl.c,v 1.14 2014/07/08 09:24:53 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -10,7 +10,7 @@
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in 16 * notice, this list of conditions and the following disclaimer in
@@ -64,8 +64,9 @@
64#include <openssl/pkcs12.h> 64#include <openssl/pkcs12.h>
65 65
66/* Generate a MAC */ 66/* Generate a MAC */
67int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, 67int
68 unsigned char *mac, unsigned int *maclen) 68PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
69 unsigned char *mac, unsigned int *maclen)
69{ 70{
70 const EVP_MD *md_type; 71 const EVP_MD *md_type;
71 HMAC_CTX hmac; 72 HMAC_CTX hmac;
@@ -73,101 +74,115 @@ int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
73 int saltlen, iter; 74 int saltlen, iter;
74 int md_size; 75 int md_size;
75 76
76 if (!PKCS7_type_is_data(p12->authsafes)) 77 if (!PKCS7_type_is_data(p12->authsafes)) {
77 { 78 PKCS12err(PKCS12_F_PKCS12_GEN_MAC,
78 PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_CONTENT_TYPE_NOT_DATA); 79 PKCS12_R_CONTENT_TYPE_NOT_DATA);
79 return 0; 80 return 0;
80 } 81 }
81 82
82 salt = p12->mac->salt->data; 83 salt = p12->mac->salt->data;
83 saltlen = p12->mac->salt->length; 84 saltlen = p12->mac->salt->length;
84 if (!p12->mac->iter) iter = 1; 85 if (!p12->mac->iter)
85 else iter = ASN1_INTEGER_get (p12->mac->iter); 86 iter = 1;
86 if(!(md_type = 87 else
87 EVP_get_digestbyobj (p12->mac->dinfo->algor->algorithm))) { 88 iter = ASN1_INTEGER_get(p12->mac->iter);
88 PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_UNKNOWN_DIGEST_ALGORITHM); 89 if (!(md_type = EVP_get_digestbyobj(
90 p12->mac->dinfo->algor->algorithm))) {
91 PKCS12err(PKCS12_F_PKCS12_GEN_MAC,
92 PKCS12_R_UNKNOWN_DIGEST_ALGORITHM);
89 return 0; 93 return 0;
90 } 94 }
91 md_size = EVP_MD_size(md_type); 95 md_size = EVP_MD_size(md_type);
92 if (md_size < 0) 96 if (md_size < 0)
93 return 0; 97 return 0;
94 if(!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter, 98 if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter,
95 md_size, key, md_type)) { 99 md_size, key, md_type)) {
96 PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_KEY_GEN_ERROR); 100 PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_KEY_GEN_ERROR);
97 return 0; 101 return 0;
98 } 102 }
99 HMAC_CTX_init(&hmac); 103 HMAC_CTX_init(&hmac);
100 if (!HMAC_Init_ex(&hmac, key, md_size, md_type, NULL) 104 if (!HMAC_Init_ex(&hmac, key, md_size, md_type, NULL) ||
101 || !HMAC_Update(&hmac, p12->authsafes->d.data->data, 105 !HMAC_Update(&hmac, p12->authsafes->d.data->data,
102 p12->authsafes->d.data->length) 106 p12->authsafes->d.data->length) ||
103 || !HMAC_Final(&hmac, mac, maclen)) 107 !HMAC_Final(&hmac, mac, maclen)) {
104 { 108 HMAC_CTX_cleanup(&hmac);
105 HMAC_CTX_cleanup(&hmac);
106 return 0; 109 return 0;
107 } 110 }
108 HMAC_CTX_cleanup(&hmac); 111 HMAC_CTX_cleanup(&hmac);
109 return 1; 112 return 1;
110} 113}
111 114
112/* Verify the mac */ 115/* Verify the mac */
113int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen) 116int
117PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen)
114{ 118{
115 unsigned char mac[EVP_MAX_MD_SIZE]; 119 unsigned char mac[EVP_MAX_MD_SIZE];
116 unsigned int maclen; 120 unsigned int maclen;
117 if(p12->mac == NULL) { 121 if (p12->mac == NULL) {
118 PKCS12err(PKCS12_F_PKCS12_VERIFY_MAC,PKCS12_R_MAC_ABSENT); 122 PKCS12err(PKCS12_F_PKCS12_VERIFY_MAC, PKCS12_R_MAC_ABSENT);
119 return 0; 123 return 0;
120 } 124 }
121 if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) { 125 if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) {
122 PKCS12err(PKCS12_F_PKCS12_VERIFY_MAC,PKCS12_R_MAC_GENERATION_ERROR); 126 PKCS12err(PKCS12_F_PKCS12_VERIFY_MAC,
127 PKCS12_R_MAC_GENERATION_ERROR);
123 return 0; 128 return 0;
124 } 129 }
125 if ((maclen != (unsigned int)p12->mac->dinfo->digest->length) 130 if ((maclen != (unsigned int)p12->mac->dinfo->digest->length) ||
126 || memcmp (mac, p12->mac->dinfo->digest->data, maclen)) return 0; 131 memcmp(mac, p12->mac->dinfo->digest->data, maclen))
132 return 0;
127 return 1; 133 return 1;
128} 134}
129 135
130/* Set a mac */ 136/* Set a mac */
131 137
132int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, 138int
133 unsigned char *salt, int saltlen, int iter, const EVP_MD *md_type) 139PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *salt,
140 int saltlen, int iter, const EVP_MD *md_type)
134{ 141{
135 unsigned char mac[EVP_MAX_MD_SIZE]; 142 unsigned char mac[EVP_MAX_MD_SIZE];
136 unsigned int maclen; 143 unsigned int maclen;
137 144
138 if (!md_type) md_type = EVP_sha1(); 145 if (!md_type)
146 md_type = EVP_sha1();
139 if (PKCS12_setup_mac (p12, iter, salt, saltlen, md_type) == 147 if (PKCS12_setup_mac (p12, iter, salt, saltlen, md_type) ==
140 PKCS12_ERROR) { 148 PKCS12_ERROR) {
141 PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_SETUP_ERROR); 149 PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_SETUP_ERROR);
142 return 0; 150 return 0;
143 } 151 }
144 if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) { 152 if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) {
145 PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_GENERATION_ERROR); 153 PKCS12err(PKCS12_F_PKCS12_SET_MAC,
154 PKCS12_R_MAC_GENERATION_ERROR);
146 return 0; 155 return 0;
147 } 156 }
148 if (!(M_ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) { 157 if (!(M_ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) {
149 PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_STRING_SET_ERROR); 158 PKCS12err(PKCS12_F_PKCS12_SET_MAC,
150 return 0; 159 PKCS12_R_MAC_STRING_SET_ERROR);
160 return 0;
151 } 161 }
152 return 1; 162 return 1;
153} 163}
154 164
155/* Set up a mac structure */ 165/* Set up a mac structure */
156int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, 166int
157 const EVP_MD *md_type) 167PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
168 const EVP_MD *md_type)
158{ 169{
159 if (!(p12->mac = PKCS12_MAC_DATA_new())) return PKCS12_ERROR; 170 if (!(p12->mac = PKCS12_MAC_DATA_new()))
171 return PKCS12_ERROR;
160 if (iter > 1) { 172 if (iter > 1) {
161 if(!(p12->mac->iter = M_ASN1_INTEGER_new())) { 173 if (!(p12->mac->iter = M_ASN1_INTEGER_new())) {
162 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); 174 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC,
175 ERR_R_MALLOC_FAILURE);
163 return 0; 176 return 0;
164 } 177 }
165 if (!ASN1_INTEGER_set(p12->mac->iter, iter)) { 178 if (!ASN1_INTEGER_set(p12->mac->iter, iter)) {
166 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); 179 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC,
180 ERR_R_MALLOC_FAILURE);
167 return 0; 181 return 0;
168 } 182 }
169 } 183 }
170 if (!saltlen) saltlen = PKCS12_SALT_LEN; 184 if (!saltlen)
185 saltlen = PKCS12_SALT_LEN;
171 p12->mac->salt->length = saltlen; 186 p12->mac->salt->length = saltlen;
172 if (!(p12->mac->salt->data = malloc (saltlen))) { 187 if (!(p12->mac->salt->data = malloc (saltlen))) {
173 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); 188 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
@@ -176,15 +191,15 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
176 if (!salt) { 191 if (!salt) {
177 if (RAND_pseudo_bytes (p12->mac->salt->data, saltlen) < 0) 192 if (RAND_pseudo_bytes (p12->mac->salt->data, saltlen) < 0)
178 return 0; 193 return 0;
179 } 194 } else
180 else memcpy (p12->mac->salt->data, salt, saltlen); 195 memcpy (p12->mac->salt->data, salt, saltlen);
181 p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type)); 196 p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type));
182 if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) { 197 if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) {
183 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); 198 PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
184 return 0; 199 return 0;
185 } 200 }
186 p12->mac->dinfo->algor->parameter->type = V_ASN1_NULL; 201 p12->mac->dinfo->algor->parameter->type = V_ASN1_NULL;
187 202
188 return 1; 203 return 1;
189} 204}
190#endif 205#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-25 22:45:54 +0000