X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.h;h=371de8373cb13569daf8b2e31d886d3755847a98;hb=510f49e405e71ba5c97875e7a019364e1ef5fac9;hp=e260c1fff27a52eb11b746187edccc51b73cdb5f;hpb=541abf92583cd93f3952aa0e3b8f61ba9251f3fa;p=PuTTY.git diff --git a/ssh.h b/ssh.h index e260c1ff..371de837 100644 --- a/ssh.h +++ b/ssh.h @@ -24,6 +24,7 @@ void sshfwd_x11_is_local(struct ssh_channel *c); extern Socket ssh_connection_sharing_init(const char *host, int port, Conf *conf, Ssh ssh, void **state); +int ssh_share_test_for_upstream(const char *host, int port, Conf *conf); void share_got_pkt_from_server(void *ctx, int type, unsigned char *pkt, int pktlen); void share_activate(void *state, const char *server_verstring); @@ -44,7 +45,8 @@ void ssh_sharing_remove_x11_display(Ssh ssh, struct X11FakeAuth *auth); void ssh_send_packet_from_downstream(Ssh ssh, unsigned id, int type, const void *pkt, int pktlen, const char *additional_log_text); -void ssh_sharing_downstream_connected(Ssh ssh, unsigned id); +void ssh_sharing_downstream_connected(Ssh ssh, unsigned id, + const char *peerinfo); void ssh_sharing_downstream_disconnected(Ssh ssh, unsigned id); void ssh_sharing_logf(Ssh ssh, unsigned id, const char *logfmt, ...); int ssh_agent_forwarding_permitted(Ssh ssh); @@ -124,31 +126,47 @@ struct ec_mcurve 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 } type; + enum { EC_WEIERSTRASS, EC_MONTGOMERY, EC_EDWARDS } type; + /* 'name' is the identifier of the curve when it has to appear in + * wire protocol encodings, as it does in e.g. the public key and + * signature formats for NIST curves. Curves which do not format + * their keys or signatures in this way just have name==NULL. + * + * 'textname' is non-NULL for all curves, and is a human-readable + * identification suitable for putting in log messages. */ + const char *name, *textname; unsigned int fieldBits; 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); +const struct ssh_signkey *ec_alg_by_oid(int len, const void *oid, + const struct ec_curve **curve); +const unsigned char *ec_alg_oid(const struct ssh_signkey *alg, int *oidlen); +extern const int ec_nist_curve_lengths[], n_ec_nist_curve_lengths; +int ec_nist_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg); +int ec_ed_alg_and_curve_by_bits(int bits, + const struct ec_curve **curve, + const struct ssh_signkey **alg); + +struct ssh_signkey; struct ec_key { + const struct ssh_signkey *signalg; struct ec_point publicKey; Bignum privateKey; }; @@ -200,7 +218,9 @@ void ssh_rsakex_encrypt(const struct ssh_hash *h, unsigned char *in, int inlen, /* * SSH2 ECDH key exchange functions */ -void *ssh_ecdhkex_newkey(const char *name); +struct ssh_kex; +const char *ssh_ecdhkex_curve_textname(const struct ssh_kex *kex); +void *ssh_ecdhkex_newkey(const struct ssh_kex *kex); void ssh_ecdhkex_freekey(void *key); char *ssh_ecdhkex_getpublic(void *key, int *len); Bignum ssh_ecdhkex_getkey(void *key, char *remoteKey, int remoteKeyLen); @@ -232,7 +252,7 @@ void MD5Update(struct MD5Context *context, unsigned char const *buf, void MD5Final(unsigned char digest[16], struct MD5Context *context); void MD5Simple(void const *p, unsigned len, unsigned char output[16]); -void *hmacmd5_make_context(void); +void *hmacmd5_make_context(void *); void hmacmd5_free_context(void *handle); void hmacmd5_key(void *handle, void const *key, int len); void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len, @@ -278,6 +298,7 @@ void SHA384_Init(SHA384_State * s); void SHA384_Final(SHA384_State * s, unsigned char *output); void SHA384_Simple(const void *p, int len, unsigned char *output); +struct ssh_mac; struct ssh_cipher { void *(*make_context)(void); void (*free_context)(void *); @@ -285,7 +306,7 @@ struct ssh_cipher { void (*encrypt) (void *, unsigned char *blk, int len); void (*decrypt) (void *, unsigned char *blk, int len); int blksize; - char *text_name; + const char *text_name; }; struct ssh2_cipher { @@ -295,12 +316,30 @@ struct ssh2_cipher { void (*setkey) (void *, unsigned char *key);/* for SSH-2 */ void (*encrypt) (void *, unsigned char *blk, int len); void (*decrypt) (void *, unsigned char *blk, int len); - char *name; + /* Ignored unless SSH_CIPHER_SEPARATE_LENGTH flag set */ + void (*encrypt_length) (void *, unsigned char *blk, int len, unsigned long seq); + void (*decrypt_length) (void *, unsigned char *blk, int len, unsigned long seq); + const char *name; int blksize; - int keylen; + /* real_keybits is the number of bits of entropy genuinely used by + * the cipher scheme; it's used for deciding how big a + * Diffie-Hellman group is needed to exchange a key for the + * cipher. */ + int real_keybits; + /* padded_keybytes is the number of bytes of key data expected as + * input to the setkey function; it's used for deciding how much + * data needs to be generated from the post-kex generation of key + * material. In a sensible cipher which uses all its key bytes for + * real work, this will just be real_keybits/8, but in DES-type + * ciphers which ignore one bit in each byte, it'll be slightly + * different. */ + int padded_keybytes; unsigned int flags; #define SSH_CIPHER_IS_CBC 1 - char *text_name; +#define SSH_CIPHER_SEPARATE_LENGTH 2 + const char *text_name; + /* If set, this takes priority over other MAC. */ + const struct ssh_mac *required_mac; }; struct ssh2_ciphers { @@ -309,7 +348,8 @@ struct ssh2_ciphers { }; struct ssh_mac { - void *(*make_context)(void); + /* Passes in the cipher context */ + void *(*make_context)(void *); void (*free_context)(void *); void (*setkey) (void *, unsigned char *key); /* whole-packet operations */ @@ -320,26 +360,26 @@ struct ssh_mac { void (*bytes) (void *, unsigned char const *, int); void (*genresult) (void *, unsigned char *); int (*verresult) (void *, unsigned char const *); - char *name, *etm_name; - int len; - char *text_name; + const char *name, *etm_name; + int len, keylen; + const char *text_name; }; struct ssh_hash { void *(*init)(void); /* also allocates context */ - void (*bytes)(void *, void *, int); + void *(*copy)(const void *); + void (*bytes)(void *, const void *, int); void (*final)(void *, unsigned char *); /* also frees context */ + void (*free)(void *); int hlen; /* output length in bytes */ - char *text_name; + const char *text_name; }; struct ssh_kex { - char *name, *groupname; + const char *name, *groupname; enum { KEXTYPE_DH, KEXTYPE_RSA, KEXTYPE_ECDH } main_type; - /* For DH */ - const unsigned char *pdata, *gdata; /* NULL means group exchange */ - int plen, glen; const struct ssh_hash *hash; + const void *extra; /* private to the kex methods */ }; struct ssh_kexes { @@ -348,14 +388,17 @@ struct ssh_kexes { }; struct ssh_signkey { - void *(*newkey) (const char *data, int len); + void *(*newkey) (const struct ssh_signkey *self, + const char *data, int len); void (*freekey) (void *key); char *(*fmtkey) (void *key); unsigned char *(*public_blob) (void *key, int *len); unsigned char *(*private_blob) (void *key, int *len); - void *(*createkey) (const unsigned char *pub_blob, int pub_len, + void *(*createkey) (const struct ssh_signkey *self, + const unsigned char *pub_blob, int pub_len, const unsigned char *priv_blob, int priv_len); - void *(*openssh_createkey) (const unsigned char **blob, int *len); + void *(*openssh_createkey) (const struct ssh_signkey *self, + const unsigned char **blob, int *len); int (*openssh_fmtkey) (void *key, unsigned char *blob, int len); /* OpenSSH private key blobs, as created by openssh_fmtkey and * consumed by openssh_createkey, always (at least so far...) take @@ -366,21 +409,22 @@ struct ssh_signkey { * skip over the right number to find the next key in the file. * openssh_private_npieces gives that information. */ int openssh_private_npieces; - int (*pubkey_bits) (const void *blob, int len); - char *(*fingerprint) (void *key); + int (*pubkey_bits) (const struct ssh_signkey *self, + const void *blob, int len); int (*verifysig) (void *key, const char *sig, int siglen, const char *data, int datalen); unsigned char *(*sign) (void *key, const char *data, int datalen, int *siglen); - char *name; - char *keytype; /* for host key cache */ + const char *name; + const char *keytype; /* for host key cache */ + const void *extra; /* private to the public key methods */ }; struct ssh_compress { - char *name; + const char *name; /* For zlib@openssh.com: if non-NULL, this name will be considered once * userauth has completed successfully. */ - char *delayed_name; + const char *delayed_name; void *(*compress_init) (void); void (*compress_cleanup) (void *); int (*compress) (void *, unsigned char *block, int len, @@ -390,7 +434,7 @@ struct ssh_compress { int (*decompress) (void *, unsigned char *block, int len, unsigned char **outblock, int *outlen); int (*disable_compression) (void *); - char *text_name; + const char *text_name; }; struct ssh2_userkey { @@ -410,6 +454,7 @@ extern const struct ssh2_ciphers ssh2_des; extern const struct ssh2_ciphers ssh2_aes; extern const struct ssh2_ciphers ssh2_blowfish; extern const struct ssh2_ciphers ssh2_arcfour; +extern const struct ssh2_ciphers ssh2_ccp; extern const struct ssh_hash ssh_sha1; extern const struct ssh_hash ssh_sha256; extern const struct ssh_hash ssh_sha384; @@ -421,6 +466,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; @@ -443,7 +489,7 @@ void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len); /* * PuTTY version number formatted as an SSH version string. */ -extern char sshver[]; +extern const char sshver[]; /* * Gross hack: pscp will try to start SFTP but fall back to scp1 if @@ -466,7 +512,8 @@ struct PortForwarding; /* Allocate and register a new channel for port forwarding */ void *new_sock_channel(void *handle, struct PortForwarding *pf); -void ssh_send_port_open(void *channel, char *hostname, int port, char *org); +void ssh_send_port_open(void *channel, const char *hostname, int port, + const char *org); /* Exports from portfwd.c */ extern char *pfd_connect(struct PortForwarding **pf, char *hostname, int port, @@ -621,11 +668,13 @@ 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); #endif +int dh_is_gex(const struct ssh_kex *kex); void *dh_setup_group(const struct ssh_kex *kex); void *dh_setup_gex(Bignum pval, Bignum gval); void dh_cleanup(void *); @@ -634,17 +683,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; @@ -652,7 +702,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); @@ -665,12 +716,55 @@ 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); +char *ssh2_fingerprint_blob(const void *blob, int bloblen); +char *ssh2_fingerprint(const struct ssh_signkey *alg, void *data); int key_type(const Filename *filename); -char *key_type_to_str(int type); +const char *key_type_to_str(int type); int import_possible(int type); int import_target_type(int type); @@ -721,6 +815,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);