Fri Jul 28 04:58:27 2023 UTC ()
openssh: whitespace


(rin)
diff -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/ssh_api.c
cvs diff -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/ssh_api.c (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/dist/ssh_api.c 2023/07/26 17:58:16 1.14
+++ src/crypto/external/bsd/openssh/dist/ssh_api.c 2023/07/28 04:58:27 1.15
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1/* $NetBSD: ssh_api.c,v 1.14 2023/07/26 17:58:16 christos Exp $ */ 1/* $NetBSD: ssh_api.c,v 1.15 2023/07/28 04:58:27 rin Exp $ */
2/* $OpenBSD: ssh_api.c,v 1.27 2021/04/03 06:18:41 djm Exp $ */ 2/* $OpenBSD: ssh_api.c,v 1.27 2021/04/03 06:18:41 djm Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2012 Markus Friedl. All rights reserved. 5 * Copyright (c) 2012 Markus Friedl. All rights reserved.
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20#include "includes.h" 20#include "includes.h"
21__RCSID("$NetBSD: ssh_api.c,v 1.14 2023/07/26 17:58:16 christos Exp $"); 21__RCSID("$NetBSD: ssh_api.c,v 1.15 2023/07/28 04:58:27 rin Exp $");
22 22
23#include <sys/types.h> 23#include <sys/types.h>
24 24
25#include <stdio.h> 25#include <stdio.h>
26#include <stdlib.h> 26#include <stdlib.h>
27 27
28#include "ssh_api.h" 28#include "ssh_api.h"
29#include "compat.h" 29#include "compat.h"
30#include "log.h" 30#include "log.h"
31#include "authfile.h" 31#include "authfile.h"
32#include "sshkey.h" 32#include "sshkey.h"
33#include "misc.h" 33#include "misc.h"
34#include "ssh2.h" 34#include "ssh2.h"
@@ -72,27 +72,27 @@ mm_sshkey_sign(struct sshkey *key, u_cha @@ -72,27 +72,27 @@ mm_sshkey_sign(struct sshkey *key, u_cha
72#ifdef WITH_OPENSSL 72#ifdef WITH_OPENSSL
73DH * 73DH *
74mm_choose_dh(int min, int nbits, int max) 74mm_choose_dh(int min, int nbits, int max)
75{ 75{
76 return (NULL); 76 return (NULL);
77} 77}
78#endif 78#endif
79 79
80/* API */ 80/* API */
81 81
82int 82int
83ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) 83ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params)
84{ 84{
85 const char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; 85 const char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };
86 struct ssh *ssh; 86 struct ssh *ssh;
87 const char **proposal; 87 const char **proposal;
88 static int called; 88 static int called;
89 int r; 89 int r;
90 90
91 if (!called) { 91 if (!called) {
92#ifdef WITH_OPENSSL 92#ifdef WITH_OPENSSL
93 OpenSSL_add_all_algorithms(); 93 OpenSSL_add_all_algorithms();
94#endif 94#endif
95 called = 1; 95 called = 1;
96 } 96 }
97 97
98 if ((ssh = ssh_packet_set_connection(NULL, -1, -1)) == NULL) 98 if ((ssh = ssh_packet_set_connection(NULL, -1, -1)) == NULL)