summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9202b1b)
casts explicit.
git-svn-id: svn://svn.tartarus.org/sgt/putty@2464
cda61777-01e9-0310-a592-
d414129be87e
*/
if (ciphertype) {
MD5Init(&md5c);
*/
if (ciphertype) {
MD5Init(&md5c);
- MD5Update(&md5c, passphrase, strlen(passphrase));
+ MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
MD5Final(keybuf, &md5c);
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
{
FILE *fp;
int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
{
FILE *fp;
fp = fopen(filename, "rb");
if (!fp)
fp = fopen(filename, "rb");
if (!fp)
int rsakey_encrypted(char *filename, char **comment)
{
FILE *fp;
int rsakey_encrypted(char *filename, char **comment)
{
FILE *fp;
fp = fopen(filename, "rb");
if (!fp)
fp = fopen(filename, "rb");
if (!fp)
int rsakey_pubblob(char *filename, void **blob, int *bloblen)
{
FILE *fp;
int rsakey_pubblob(char *filename, void **blob, int *bloblen)
{
FILE *fp;
struct RSAKey key;
int ret;
struct RSAKey key;
int ret;
*/
if (passphrase) {
MD5Init(&md5c);
*/
if (passphrase) {
MD5Init(&md5c);
- MD5Update(&md5c, passphrase, strlen(passphrase));
+ MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_encrypt_pubkey(keybuf, estart, p - estart);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
MD5Final(keybuf, &md5c);
des3_encrypt_pubkey(keybuf, estart, p - estart);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
-static char *read_blob(FILE * fp, int nlines, int *bloblen)
+static unsigned char *read_blob(FILE * fp, int nlines, int *bloblen)
{
unsigned char *blob;
char *line;
{
unsigned char *blob;
char *line;
*pub_blob_len = public_blob_len;
if (algorithm)
*algorithm = alg->name;
*pub_blob_len = public_blob_len;
if (algorithm)
*algorithm = alg->name;
+ return (char *)public_blob;
SHA_State s;
passlen = strlen(passphrase);
SHA_State s;
passlen = strlen(passphrase);