#include "ssh.h"
#include "misc.h"
-#define PUT_32BIT(cp, value) do { \
- (cp)[3] = (unsigned char)(value); \
- (cp)[2] = (unsigned char)((value) >> 8); \
- (cp)[1] = (unsigned char)((value) >> 16); \
- (cp)[0] = (unsigned char)((value) >> 24); } while (0)
-
-#define GET_32BIT(cp) \
- (((unsigned long)(unsigned char)(cp)[0] << 24) | \
- ((unsigned long)(unsigned char)(cp)[1] << 16) | \
- ((unsigned long)(unsigned char)(cp)[2] << 8) | \
- ((unsigned long)(unsigned char)(cp)[3]))
-
int openssh_encrypted(const Filename *filename);
struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase,
const char **errmsg_p);
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
- memset(&ret, 0, sizeof(ret));
+ memset(ret, 0, sizeof(*ret));
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
ret = key->encrypted;
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(&key, 0, sizeof(key));
+ memset(key, 0, sizeof(*key));
sfree(key);
return ret;
}
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(&key, 0, sizeof(key));
+ memset(key, 0, sizeof(*key));
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return retval;
footer = "-----END DSA PRIVATE KEY-----\n";
} else {
assert(0); /* zoinks! */
+ exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
}
/*
memset(ret->keyblob, 0, ret->keyblob_size);
sfree(ret->keyblob);
}
- memset(&ret, 0, sizeof(ret));
+ memset(ret, 0, sizeof(*ret));
sfree(ret);
}
if (errmsg_p) *errmsg_p = errmsg;
*comment = dupstr(key->comment);
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(&key, 0, sizeof(key));
+ memset(key, 0, sizeof(*key));
sfree(key);
return answer;
}
}
memset(key->keyblob, 0, key->keyblob_size);
sfree(key->keyblob);
- memset(&key, 0, sizeof(key));
+ memset(key, 0, sizeof(*key));
sfree(key);
if (errmsg_p) *errmsg_p = errmsg;
return ret;
type = "dl-modp{sign{dsa-nist-sha1},dh{plain}}";
} else {
assert(0); /* zoinks! */
+ exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
}
/*