Deleted Added
sdiff udiff text old ( 280304 ) new ( 291721 )
full compact
evp_key.c (280304) evp_key.c (291721)
1/* crypto/evp/evp_key.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 90 unchanged lines hidden (view full) ---

99{
100 int ret;
101 char buff[BUFSIZ];
102 UI *ui;
103
104 if ((prompt == NULL) && (prompt_string[0] != '\0'))
105 prompt = prompt_string;
106 ui = UI_new();
1/* crypto/evp/evp_key.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 90 unchanged lines hidden (view full) ---

99{
100 int ret;
101 char buff[BUFSIZ];
102 UI *ui;
103
104 if ((prompt == NULL) && (prompt_string[0] != '\0'))
105 prompt = prompt_string;
106 ui = UI_new();
107 if (ui == NULL)
108 return -1;
107 UI_add_input_string(ui, prompt, 0, buf, min,
108 (len >= BUFSIZ) ? BUFSIZ - 1 : len);
109 if (verify)
110 UI_add_verify_string(ui, prompt, 0,
111 buff, min, (len >= BUFSIZ) ? BUFSIZ - 1 : len,
112 buf);
113 ret = UI_process(ui);
114 UI_free(ui);

--- 17 unchanged lines hidden (view full) ---

132 OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH);
133
134 if (data == NULL)
135 return (nkey);
136
137 EVP_MD_CTX_init(&c);
138 for (;;) {
139 if (!EVP_DigestInit_ex(&c, md, NULL))
109 UI_add_input_string(ui, prompt, 0, buf, min,
110 (len >= BUFSIZ) ? BUFSIZ - 1 : len);
111 if (verify)
112 UI_add_verify_string(ui, prompt, 0,
113 buff, min, (len >= BUFSIZ) ? BUFSIZ - 1 : len,
114 buf);
115 ret = UI_process(ui);
116 UI_free(ui);

--- 17 unchanged lines hidden (view full) ---

134 OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH);
135
136 if (data == NULL)
137 return (nkey);
138
139 EVP_MD_CTX_init(&c);
140 for (;;) {
141 if (!EVP_DigestInit_ex(&c, md, NULL))
140 return 0;
142 goto err;
141 if (addmd++)
142 if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))
143 goto err;
144 if (!EVP_DigestUpdate(&c, data, datal))
145 goto err;
146 if (salt != NULL)
147 if (!EVP_DigestUpdate(&c, salt, PKCS5_SALT_LEN))
148 goto err;

--- 34 unchanged lines hidden (view full) ---

183 }
184 }
185 if ((nkey == 0) && (niv == 0))
186 break;
187 }
188 rv = type->key_len;
189 err:
190 EVP_MD_CTX_cleanup(&c);
143 if (addmd++)
144 if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))
145 goto err;
146 if (!EVP_DigestUpdate(&c, data, datal))
147 goto err;
148 if (salt != NULL)
149 if (!EVP_DigestUpdate(&c, salt, PKCS5_SALT_LEN))
150 goto err;

--- 34 unchanged lines hidden (view full) ---

185 }
186 }
187 if ((nkey == 0) && (niv == 0))
188 break;
189 }
190 rv = type->key_len;
191 err:
192 EVP_MD_CTX_cleanup(&c);
191 OPENSSL_cleanse(&(md_buf[0]), EVP_MAX_MD_SIZE);
193 OPENSSL_cleanse(md_buf, sizeof(md_buf));
192 return rv;
193}
194 return rv;
195}