projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for resetting the terminal modes on stderr to something sensible
[u/mdw/putty]
/
sshpubk.c
diff --git
a/sshpubk.c
b/sshpubk.c
index
923ebe9
..
f35febe
100644
(file)
--- a/
sshpubk.c
+++ b/
sshpubk.c
@@
-71,11
+71,6
@@
static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
if (i < 0)
goto end; /* overran */
if (i < 0)
goto end; /* overran */
- if (pub_only) {
- ret = 1;
- goto end;
- }
-
/* Next, the comment field. */
j = GET_32BIT(buf + i);
i += 4;
/* Next, the comment field. */
j = GET_32BIT(buf + i);
i += 4;
@@
-88,9
+83,17
@@
static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
}
i += j;
if (commentptr)
}
i += j;
if (commentptr)
- *commentptr =
comment
;
+ *commentptr =
dupstr(comment)
;
if (key)
key->comment = comment;
if (key)
key->comment = comment;
+ else
+ sfree(comment);
+
+ if (pub_only) {
+ ret = 1;
+ goto end;
+ }
+
if (!key) {
ret = ciphertype != 0;
*error = NULL;
if (!key) {
ret = ciphertype != 0;
*error = NULL;
@@
-159,7
+162,7
@@
int loadrsakey(const Filename *filename, struct RSAKey *key, char *passphrase,
int ret = 0;
const char *error = NULL;
int ret = 0;
const char *error = NULL;
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp) {
error = "can't open file";
goto end;
if (!fp) {
error = "can't open file";
goto end;
@@
-200,7
+203,7
@@
int rsakey_encrypted(const Filename *filename, char **comment)
FILE *fp;
char buf[64];
FILE *fp;
char buf[64];
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp)
return 0; /* doesn't even exist */
if (!fp)
return 0; /* doesn't even exist */
@@
-225,7
+228,7
@@
int rsakey_encrypted(const Filename *filename, char **comment)
* exponent, modulus).
*/
int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
* exponent, modulus).
*/
int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
- const char **errorstr)
+ c
har **commentptr, c
onst char **errorstr)
{
FILE *fp;
char buf[64];
{
FILE *fp;
char buf[64];
@@
-238,7
+241,7
@@
int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
*bloblen = 0;
ret = 0;
*bloblen = 0;
ret = 0;
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp) {
error = "can't open file";
goto end;
if (!fp) {
error = "can't open file";
goto end;
@@
-250,7
+253,7
@@
int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
*/
if (fgets(buf, sizeof(buf), fp) && !strcmp(buf, rsa_signature)) {
memset(&key, 0, sizeof(key));
*/
if (fgets(buf, sizeof(buf), fp) && !strcmp(buf, rsa_signature)) {
memset(&key, 0, sizeof(key));
- if (loadrsakey_main(fp, &key, TRUE,
NULL
, NULL, &error)) {
+ if (loadrsakey_main(fp, &key, TRUE,
commentptr
, NULL, &error)) {
*blob = rsa_public_blob(&key, bloblen);
freersakey(&key);
ret = 1;
*blob = rsa_public_blob(&key, bloblen);
freersakey(&key);
ret = 1;
@@
-361,7
+364,7
@@
int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase)
/*
* Done. Write the result to the file.
*/
/*
* Done. Write the result to the file.
*/
- fp = f_open(*filename, "wb");
+ fp = f_open(*filename, "wb"
, TRUE
);
if (fp) {
int ret = (fwrite(buf, 1, p - buf, fp) == (size_t) (p - buf));
if (fclose(fp))
if (fp) {
int ret = (fwrite(buf, 1, p - buf, fp) == (size_t) (p - buf));
if (fclose(fp))
@@
-631,7
+634,7
@@
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
encryption = comment = mac = NULL;
public_blob = private_blob = NULL;
encryption = comment = mac = NULL;
public_blob = private_blob = NULL;
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp) {
error = "can't open file";
goto error;
if (!fp) {
error = "can't open file";
goto error;
@@
-865,9
+868,9
@@
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
return ret;
}
return ret;
}
-char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
- int *pub_blob_len, char **commentptr,
- const char **errorstr)
+
unsigned
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
+
int *pub_blob_len, char **commentptr,
+
const char **errorstr)
{
FILE *fp;
char header[40], *b;
{
FILE *fp;
char header[40], *b;
@@
-880,7
+883,7
@@
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
public_blob = NULL;
public_blob = NULL;
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp) {
error = "can't open file";
goto error;
if (!fp) {
error = "can't open file";
goto error;
@@
-937,7
+940,7
@@
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
*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;
+ return public_blob;
/*
* Error processing.
/*
* Error processing.
@@
-961,7
+964,7
@@
int ssh2_userkey_encrypted(const Filename *filename, char **commentptr)
if (commentptr)
*commentptr = NULL;
if (commentptr)
*commentptr = NULL;
- fp = f_open(*filename, "rb");
+ fp = f_open(*filename, "rb"
, FALSE
);
if (!fp)
return 0;
if (!read_header(fp, header)
if (!fp)
return 0;
if (!read_header(fp, header)
@@
-1142,7
+1145,7
@@
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
memset(&s, 0, sizeof(s));
}
memset(&s, 0, sizeof(s));
}
- fp = f_open(*filename, "w");
+ fp = f_open(*filename, "w"
, TRUE
);
if (!fp)
return 0;
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
if (!fp)
return 0;
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
@@
-1178,7
+1181,7
@@
int key_type(const Filename *filename)
const char openssh_sig[] = "-----BEGIN ";
int i;
const char openssh_sig[] = "-----BEGIN ";
int i;
- fp = f_open(*filename, "r");
+ fp = f_open(*filename, "r"
, FALSE
);
if (!fp)
return SSH_KEYTYPE_UNOPENABLE;
i = fread(buf, 1, sizeof(buf), fp);
if (!fp)
return SSH_KEYTYPE_UNOPENABLE;
i = fread(buf, 1, sizeof(buf), fp);