Deleted Added
sdiff udiff text old ( 77349 ) new ( 80785 )
full compact
sfsasl.c (77349) sfsasl.c (80785)
1/*
2 * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 *
5 * By using this file, you agree to the terms and conditions set
6 * forth in the LICENSE file which can be found at the top level of
7 * the sendmail distribution.
8 *
9 */
10
11#ifndef lint
1/*
2 * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 *
5 * By using this file, you agree to the terms and conditions set
6 * forth in the LICENSE file which can be found at the top level of
7 * the sendmail distribution.
8 *
9 */
10
11#ifndef lint
12static char id[] = "@(#)$Id: sfsasl.c,v 8.17.4.14 2001/05/03 17:24:16 gshapiro Exp $";
12static char id[] = "@(#)$Id: sfsasl.c,v 8.17.4.15 2001/07/11 17:37:07 gshapiro Exp $";
13#endif /* ! lint */
14
15#if SFIO
16# include <sfio/stdio.h>
17#endif /* SFIO */
18
19#include <stdlib.h>
20#include <sendmail.h>

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

163#if STARTTLS && (SFIO || _FFR_TLS_TOREK)
164/*
165** STARTTLS
166*/
167
168# include "sfsasl.h"
169# include <openssl/err.h>
170
13#endif /* ! lint */
14
15#if SFIO
16# include <sfio/stdio.h>
17#endif /* SFIO */
18
19#include <stdlib.h>
20#include <sendmail.h>

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

163#if STARTTLS && (SFIO || _FFR_TLS_TOREK)
164/*
165** STARTTLS
166*/
167
168# include "sfsasl.h"
169# include <openssl/err.h>
170
171static ssize_t
172# if SFIO
171# if SFIO
172static ssize_t
173tls_read(f, buf, size, disc)
174 Sfio_t *f;
175 Void_t *buf;
176 size_t size;
177 Sfdisc_t *disc;
178# else /* SFIO */
173tls_read(f, buf, size, disc)
174 Sfio_t *f;
175 Void_t *buf;
176 size_t size;
177 Sfdisc_t *disc;
178# else /* SFIO */
179static int
179tls_read(disc, buf, size)
180 void *disc;
180tls_read(disc, buf, size)
181 void *disc;
181 void *buf;
182 size_t size;
182 char *buf;
183 int size;
183# endif /* SFIO */
184{
185 int r;
186 Tlsdisc_t *sd;
187
188 /* Cast back to correct type */
189 sd = (Tlsdisc_t *) disc;
190

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

221 }
222 if (err != NULL)
223 sm_syslog(LOG_WARNING, NOQID, "TLS: read error: %s",
224 err);
225 }
226 return r;
227}
228
184# endif /* SFIO */
185{
186 int r;
187 Tlsdisc_t *sd;
188
189 /* Cast back to correct type */
190 sd = (Tlsdisc_t *) disc;
191

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

222 }
223 if (err != NULL)
224 sm_syslog(LOG_WARNING, NOQID, "TLS: read error: %s",
225 err);
226 }
227 return r;
228}
229
229static ssize_t
230# if SFIO
230# if SFIO
231static ssize_t
231tls_write(f, buf, size, disc)
232 Sfio_t *f;
233 const Void_t *buf;
234 size_t size;
235 Sfdisc_t *disc;
236# else /* SFIO */
232tls_write(f, buf, size, disc)
233 Sfio_t *f;
234 const Void_t *buf;
235 size_t size;
236 Sfdisc_t *disc;
237# else /* SFIO */
238static int
237tls_write(disc, buf, size)
238 void *disc;
239tls_write(disc, buf, size)
240 void *disc;
239 const void *buf;
240 size_t size;
241 const char *buf;
242 int size;
241# endif /* SFIO */
242{
243 int r;
244 Tlsdisc_t *sd;
245
246 /* Cast back to correct type */
247 sd = (Tlsdisc_t *) disc;
248

--- 148 unchanged lines hidden --- 		243# endif /* SFIO */
244{
245 int r;
246 Tlsdisc_t *sd;
247
248 /* Cast back to correct type */
249 sd = (Tlsdisc_t *) disc;
250

--- 148 unchanged lines hidden ---