Deleted Added
sdiff udiff text old ( 294336 ) new ( 294464 )
full compact
sshkey.h (294336) sshkey.h (294464)
1/* $OpenBSD: sshkey.h,v 1.6 2015/05/21 04:55:51 djm Exp $ */
1/* $OpenBSD: sshkey.h,v 1.9 2015/08/04 05:23:06 djm Exp $ */
2
3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

57 KEY_RSA,
58 KEY_DSA,
59 KEY_ECDSA,
60 KEY_ED25519,
61 KEY_RSA_CERT,
62 KEY_DSA_CERT,
63 KEY_ECDSA_CERT,
64 KEY_ED25519_CERT,
2
3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

57 KEY_RSA,
58 KEY_DSA,
59 KEY_ECDSA,
60 KEY_ED25519,
61 KEY_RSA_CERT,
62 KEY_DSA_CERT,
63 KEY_ECDSA_CERT,
64 KEY_ED25519_CERT,
65 KEY_RSA_CERT_V00,
66 KEY_DSA_CERT_V00,
67 KEY_UNSPEC
68};
69
70/* Default fingerprint hash */
71#define SSH_FP_HASH_DEFAULT SSH_DIGEST_SHA256
72
73/* Fingerprint representation formats */
74enum sshkey_fp_rep {

--- 57 unchanged lines hidden (view full) ---

132u_int sshkey_size(const struct sshkey *);
133
134int sshkey_generate(int type, u_int bits, struct sshkey **keyp);
135int sshkey_from_private(const struct sshkey *, struct sshkey **);
136int sshkey_type_from_name(const char *);
137int sshkey_is_cert(const struct sshkey *);
138int sshkey_type_is_cert(int);
139int sshkey_type_plain(int);
65 KEY_UNSPEC
66};
67
68/* Default fingerprint hash */
69#define SSH_FP_HASH_DEFAULT SSH_DIGEST_SHA256
70
71/* Fingerprint representation formats */
72enum sshkey_fp_rep {

--- 57 unchanged lines hidden (view full) ---

130u_int sshkey_size(const struct sshkey *);
131
132int sshkey_generate(int type, u_int bits, struct sshkey **keyp);
133int sshkey_from_private(const struct sshkey *, struct sshkey **);
134int sshkey_type_from_name(const char *);
135int sshkey_is_cert(const struct sshkey *);
136int sshkey_type_is_cert(int);
137int sshkey_type_plain(int);
140int sshkey_to_certified(struct sshkey *, int);
138int sshkey_to_certified(struct sshkey *);
141int sshkey_drop_cert(struct sshkey *);
142int sshkey_certify(struct sshkey *, struct sshkey *);
143int sshkey_cert_copy(const struct sshkey *, struct sshkey *);
144int sshkey_cert_check_authority(const struct sshkey *, int, int,
145 const char *, const char **);
139int sshkey_drop_cert(struct sshkey *);
140int sshkey_certify(struct sshkey *, struct sshkey *);
141int sshkey_cert_copy(const struct sshkey *, struct sshkey *);
142int sshkey_cert_check_authority(const struct sshkey *, int, int,
143 const char *, const char **);
146int sshkey_cert_is_legacy(const struct sshkey *);
147
148int sshkey_ecdsa_nid_from_name(const char *);
149int sshkey_curve_name_to_nid(const char *);
150const char * sshkey_curve_nid_to_name(int);
151u_int sshkey_curve_nid_to_bits(int);
152int sshkey_ecdsa_bits_to_nid(int);
153int sshkey_ecdsa_key_to_nid(EC_KEY *);
154int sshkey_ec_nid_to_hash_alg(int nid);

--- 78 unchanged lines hidden --- 		144
145int sshkey_ecdsa_nid_from_name(const char *);
146int sshkey_curve_name_to_nid(const char *);
147const char * sshkey_curve_nid_to_name(int);
148u_int sshkey_curve_nid_to_bits(int);
149int sshkey_ecdsa_bits_to_nid(int);
150int sshkey_ecdsa_key_to_nid(EC_KEY *);
151int sshkey_ec_nid_to_hash_alg(int nid);

--- 78 unchanged lines hidden ---