X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.h;h=4e36ad4584ae8aa2893ab7e154926fcce11ca746;hb=eef0235a0f79e92f25f34782fc486c101fa703ee;hp=4f58337dd7526cb348e6fd6dd59994cbd5f7c191;hpb=7d6bf4a6ca94cca24189c5a81c48d78cde407038;p=PuTTY.git diff --git a/ssh.h b/ssh.h index 4f58337d..4e36ad45 100644 --- a/ssh.h +++ b/ssh.h @@ -110,27 +110,59 @@ struct ec_point { void ec_point_free(struct ec_point *point); +/* Weierstrass form curve */ +struct ec_wcurve +{ + Bignum a, b, n; + struct ec_point G; +}; + +/* Montgomery form curve */ +struct ec_mcurve +{ + Bignum a, b; + struct ec_point G; +}; + +/* Edwards form curve */ +struct ec_ecurve +{ + Bignum l, d; + struct ec_point B; +}; + struct ec_curve { + enum { EC_WEIERSTRASS, EC_MONTGOMERY, EC_EDWARDS } type; unsigned int fieldBits; - Bignum p, a, b, n; - struct ec_point G; + Bignum p; + union { + struct ec_wcurve w; + struct ec_mcurve m; + struct ec_ecurve e; + }; }; extern unsigned char nistp256_oid[]; extern unsigned char nistp384_oid[]; extern unsigned char nistp521_oid[]; +extern unsigned char curve25519_oid[]; extern int nistp256_oid_len; extern int nistp384_oid_len; extern int nistp521_oid_len; +extern int curve25519_oid_len; struct ec_curve *ec_p256(void); struct ec_curve *ec_p384(void); struct ec_curve *ec_p521(void); +struct ec_curve *ec_ed25519(void); +struct ec_curve *ec_curve25519(void); struct ec_key { struct ec_point publicKey; Bignum privateKey; }; +struct ec_point *ec_public(const Bignum privateKey, const struct ec_curve *curve); + int makekey(const unsigned char *data, int len, struct RSAKey *result, const unsigned char **keystr, int order); int makeprivate(const unsigned char *data, int len, struct RSAKey *result); @@ -176,7 +208,7 @@ void ssh_rsakex_encrypt(const struct ssh_hash *h, unsigned char *in, int inlen, /* * SSH2 ECDH key exchange functions */ -void *ssh_ecdhkex_newkey(struct ec_curve *curve); +void *ssh_ecdhkex_newkey(const char *name); void ssh_ecdhkex_freekey(void *key); char *ssh_ecdhkex_getpublic(void *key, int *len); Bignum ssh_ecdhkex_getkey(void *key, char *remoteKey, int remoteKeyLen); @@ -397,6 +429,7 @@ extern const struct ssh_kexes ssh_rsa_kex; extern const struct ssh_kexes ssh_ecdh_kex; extern const struct ssh_signkey ssh_dss; extern const struct ssh_signkey ssh_rsa; +extern const struct ssh_signkey ssh_ecdsa_ed25519; extern const struct ssh_signkey ssh_ecdsa_nistp256; extern const struct ssh_signkey ssh_ecdsa_nistp384; extern const struct ssh_signkey ssh_ecdsa_nistp521; @@ -597,6 +630,7 @@ Bignum bignum_rshift(Bignum number, int shift); Bignum bignum_lshift(Bignum number, int shift); int bignum_cmp(Bignum a, Bignum b); char *bignum_decimal(Bignum x); +Bignum bignum_from_decimal(const char *decimal); #ifdef DEBUG void diagbn(char *prefix, Bignum md); @@ -610,17 +644,18 @@ const char *dh_validate_f(void *handle, Bignum f); Bignum dh_find_K(void *, Bignum f); int loadrsakey(const Filename *filename, struct RSAKey *key, - char *passphrase, const char **errorstr); + const char *passphrase, const char **errorstr); int rsakey_encrypted(const Filename *filename, char **comment); int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen, char **commentptr, const char **errorstr); int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase); -extern int base64_decode_atom(char *atom, unsigned char *out); +extern int base64_decode_atom(const char *atom, unsigned char *out); extern int base64_lines(int datalen); -extern void base64_encode_atom(unsigned char *data, int n, char *out); -extern void base64_encode(FILE *fp, unsigned char *data, int datalen, int cpl); +extern void base64_encode_atom(const unsigned char *data, int n, char *out); +extern void base64_encode(FILE *fp, const unsigned char *data, int datalen, + int cpl); /* ssh2_load_userkey can return this as an error */ extern struct ssh2_userkey ssh2_wrong_passphrase; @@ -628,7 +663,8 @@ extern struct ssh2_userkey ssh2_wrong_passphrase; int ssh2_userkey_encrypted(const Filename *filename, char **comment); struct ssh2_userkey *ssh2_load_userkey(const Filename *filename, - char *passphrase, const char **errorstr); + const char *passphrase, + const char **errorstr); unsigned char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm, int *pub_blob_len, char **commentptr, const char **errorstr); @@ -641,10 +677,51 @@ enum { SSH_KEYTYPE_UNOPENABLE, SSH_KEYTYPE_UNKNOWN, SSH_KEYTYPE_SSH1, SSH_KEYTYPE_SSH2, + /* + * The OpenSSH key types deserve a little explanation. OpenSSH has + * two physical formats for private key storage: an old PEM-based + * one largely dictated by their use of OpenSSL and full of ASN.1, + * and a new one using the same private key formats used over the + * wire for talking to ssh-agent. The old format can only support + * a subset of the key types, because it needs redesign for each + * key type, and after a while they decided to move to the new + * format so as not to have to do that. + * + * On input, key files are identified as either + * SSH_KEYTYPE_OPENSSH_PEM or SSH_KEYTYPE_OPENSSH_NEW, describing + * accurately which actual format the keys are stored in. + * + * On output, however, we default to following OpenSSH's own + * policy of writing out PEM-style keys for maximum backwards + * compatibility if the key type supports it, and otherwise + * switching to the new format. So the formats you can select for + * output are SSH_KEYTYPE_OPENSSH_NEW (forcing the new format for + * any key type), and SSH_KEYTYPE_OPENSSH_AUTO to use the oldest + * format supported by whatever key type you're writing out. + * + * So we have three type codes, but only two of them usable in any + * given circumstance. An input key file will never be identified + * as AUTO, only PEM or NEW; key export UIs should not be able to + * select PEM, only AUTO or NEW. + */ + SSH_KEYTYPE_OPENSSH_AUTO, SSH_KEYTYPE_OPENSSH_PEM, SSH_KEYTYPE_OPENSSH_NEW, - SSH_KEYTYPE_SSHCOM + SSH_KEYTYPE_SSHCOM, + /* + * Public-key-only formats, which we still want to be able to read + * for various purposes. + */ + SSH_KEYTYPE_SSH1_PUBLIC, + SSH_KEYTYPE_SSH2_PUBLIC_RFC4716, + SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH }; +char *ssh1_pubkey_str(struct RSAKey *ssh1key); +void ssh1_write_pubkey(FILE *fp, struct RSAKey *ssh1key); +char *ssh2_pubkey_openssh_str(struct ssh2_userkey *key); +void ssh2_write_pubkey(FILE *fp, const char *comment, + const void *v_pub_blob, int pub_len, + int keytype); int key_type(const Filename *filename); char *key_type_to_str(int type); @@ -697,6 +774,8 @@ int dsa_generate(struct dss_key *key, int bits, progfn_t pfn, void *pfnparam); int ec_generate(struct ec_key *key, int bits, progfn_t pfn, void *pfnparam); +int ec_edgenerate(struct ec_key *key, int bits, progfn_t pfn, + void *pfnparam); Bignum primegen(int bits, int modulus, int residue, Bignum factor, int phase, progfn_t pfn, void *pfnparam, unsigned firstbits); void invent_firstbits(unsigned *one, unsigned *two);