38a52bd3b5
Release notes are available at https://www.openssh.com/txt/release-9.1 9.1 contains fixes for three minor memory safety problems; these have lready been merged to the copy of OpenSSH 9.0 that is in the FreeBSD base system. Some highlights copied from the release notes: Potentially-incompatible changes -------------------------------- * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config are now first-match-wins to match other directives. Previously if an environment variable was multiply specified the last set value would have been used. bz3438 * ssh-keygen(8): ssh-keygen -A (generate all default host key types) will no longer generate DSA keys, as these are insecure and have not been used by default for some years. New features ------------ * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum RSA key length. Keys below this length will be ignored for user authentication and for host authentication in sshd(8). * sftp-server(8): add a "users-groups-by-id@openssh.com" extension request that allows the client to obtain user/group names that correspond to a set of uids/gids. * sftp(1): use "users-groups-by-id@openssh.com" sftp-server extension (when available) to fill in user/group names for directory listings. * sftp-server(8): support the "home-directory" extension request defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the existing "expand-path@openssh.com", but some other clients support it. * ssh-keygen(1), sshd(8): allow certificate validity intervals, sshsig verification times and authorized_keys expiry-time options to accept dates in the UTC time zone in addition to the default of interpreting them in the system time zone. YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed with a 'Z' character. Also allow certificate validity intervals to be specified in raw seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This is intended for use by regress tests and other tools that call ssh-keygen as part of a CA workflow. bz3468 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D "/usr/libexec/sftp-server -el debug3" * ssh-keygen(1): allow the existing -U (use agent) flag to work with "-Y sign" operations, where it will be interpreted to require that the private keys is hosted in an agent; bz3429 MFC after: 2 weeks Relnotes: Yes Sponsored by: The FreeBSD Foundation
103 lines
3.8 KiB
C
103 lines
3.8 KiB
C
/* $OpenBSD: monitor_wrap.h,v 1.49 2022/06/15 16:08:25 djm Exp $ */
|
|
|
|
/*
|
|
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _MM_WRAP_H_
|
|
#define _MM_WRAP_H_
|
|
|
|
extern int use_privsep;
|
|
#define PRIVSEP(x) (use_privsep ? mm_##x : x)
|
|
|
|
enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY };
|
|
|
|
struct ssh;
|
|
struct monitor;
|
|
struct Authctxt;
|
|
struct sshkey;
|
|
struct sshauthopt;
|
|
struct sshkey_sig_details;
|
|
|
|
void mm_log_handler(LogLevel, int, const char *, void *);
|
|
int mm_is_monitor(void);
|
|
#ifdef WITH_OPENSSL
|
|
DH *mm_choose_dh(int, int, int);
|
|
#endif
|
|
int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *,
|
|
const u_char *, size_t, const char *, const char *,
|
|
const char *, u_int compat);
|
|
void mm_inform_authserv(char *, char *);
|
|
struct passwd *mm_getpwnamallow(struct ssh *, const char *);
|
|
char *mm_auth2_read_banner(void);
|
|
int mm_auth_password(struct ssh *, char *);
|
|
int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *,
|
|
int, struct sshauthopt **);
|
|
int mm_user_key_allowed(struct ssh *ssh, struct passwd *, struct sshkey *, int,
|
|
struct sshauthopt **);
|
|
int mm_hostbased_key_allowed(struct ssh *, struct passwd *, const char *,
|
|
const char *, struct sshkey *);
|
|
int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
|
|
const u_char *, size_t, const char *, u_int, struct sshkey_sig_details **);
|
|
|
|
#ifdef GSSAPI
|
|
OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
|
|
OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
|
|
gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
|
|
int mm_ssh_gssapi_userok(char *user);
|
|
OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
|
|
#endif
|
|
|
|
#ifdef USE_PAM
|
|
void mm_start_pam(struct ssh *ssh);
|
|
u_int mm_do_pam_account(void);
|
|
void *mm_sshpam_init_ctx(struct Authctxt *);
|
|
int mm_sshpam_query(void *, char **, char **, u_int *, char ***, u_int **);
|
|
int mm_sshpam_respond(void *, u_int, char **);
|
|
void mm_sshpam_free_ctx(void *);
|
|
#endif
|
|
|
|
#ifdef SSH_AUDIT_EVENTS
|
|
#include "audit.h"
|
|
void mm_audit_event(struct ssh *, ssh_audit_event_t);
|
|
void mm_audit_run_command(const char *);
|
|
#endif
|
|
|
|
struct Session;
|
|
void mm_terminate(void);
|
|
int mm_pty_allocate(int *, int *, char *, size_t);
|
|
void mm_session_pty_cleanup2(struct Session *);
|
|
|
|
/* Key export functions */
|
|
struct newkeys *mm_newkeys_from_blob(u_char *, int);
|
|
int mm_newkeys_to_blob(int, u_char **, u_int *);
|
|
|
|
void mm_send_keystate(struct ssh *, struct monitor*);
|
|
|
|
/* bsdauth */
|
|
int mm_bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **);
|
|
int mm_bsdauth_respond(void *, u_int, char **);
|
|
|
|
#endif /* _MM_WRAP_H_ */
|