58c58
< * $FreeBSD: head/crypto/openssl/ssl/s2_lib.c 55949 2000-01-14 05:24:08Z kris $
---
> * $FreeBSD: head/crypto/openssl/ssl/s2_lib.c 59194 2000-04-13 07:15:03Z kris $
60a61
> #include "ssl_locl.h"
66d66
< #include "ssl_locl.h"
80c80,81
< SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5|SSL_EXP40|SSL_SSLV2,
---
> SSL_kRSA|SSL_aRSA|SSL_eNULL|SSL_MD5|SSL_SSLV2,
> SSL_EXPORT|SSL_EXP40,
81a83
> 0,
82a85
> SSL_ALL_STRENGTHS,
90c93,94
< SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP40|SSL_SSLV2,
---
> SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_SSLV2,
> SSL_EXPORT|SSL_EXP40,
91a96,97
> 40,
> 128,
92a99
> SSL_ALL_STRENGTHS,
99c106,107
< SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,
---
> SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_MEDIUM,
100a109,110
> 128,
> 128,
101a112
> SSL_ALL_STRENGTHS,
108c119,120
< SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP40|SSL_SSLV2,
---
> SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_SSLV2,
> SSL_EXPORT|SSL_EXP40,
109a122,123
> 40,
> 128,
110a125
> SSL_ALL_STRENGTHS,
117c132,133
< SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,
---
> SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_MEDIUM,
118a135,136
> 128,
> 128,
119a138
> SSL_ALL_STRENGTHS,
126c145,146
< SSL_kRSA|SSL_aRSA|SSL_IDEA|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_MEDIUM,
---
> SSL_kRSA|SSL_aRSA|SSL_IDEA|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_MEDIUM,
127a148,149
> 128,
> 128,
128a151
> SSL_ALL_STRENGTHS,
135c158,159
< SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_LOW,
---
> SSL_kRSA|SSL_aRSA|SSL_DES|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_LOW,
136a161,162
> 56,
> 56,
137a164
> SSL_ALL_STRENGTHS,
144c171,172
< SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5|SSL_NOT_EXP|SSL_SSLV2|SSL_HIGH,
---
> SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_HIGH,
145a174,175
> 168,
> 168,
146a177
> SSL_ALL_STRENGTHS,
154c185,186
< SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_SSLV2|SSL_LOW,
---
> SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_SSLV2,
> SSL_NOT_EXP|SSL_LOW,
155a188,189
> 64,
> 64,
156a191
> SSL_ALL_STRENGTHS,
165a201,203
> 0,
> 0,
> 0,
166a205
> SSL_ALL_STRENGTHS,
195a235,237
> ssl_undefined_function,
> ssl2_callback_ctrl, /* local */
> ssl2_ctx_callback_ctrl, /* local */
228c270
< SSL2_CTX *s2;
---
> SSL2_STATE *s2;
230,231c272,273
< if ((s2=(SSL2_CTX *)Malloc(sizeof(SSL2_CTX))) == NULL) goto err;
< memset(s2,0,sizeof(SSL2_CTX));
---
> if ((s2=Malloc(sizeof *s2)) == NULL) goto err;
> memset(s2,0,sizeof *s2);
233c275
< if ((s2->rbuf=(unsigned char *)Malloc(
---
> if ((s2->rbuf=Malloc(
235c277
< if ((s2->wbuf=(unsigned char *)Malloc(
---
> if ((s2->wbuf=Malloc(
253c295
< SSL2_CTX *s2;
---
> SSL2_STATE *s2;
261c303
< memset(s2,0,sizeof(SSL2_CTX));
---
> memset(s2,0,sizeof *s2);
268c310
< SSL2_CTX *s2;
---
> SSL2_STATE *s2;
276c318
< memset(s2,0,sizeof(SSL2_CTX));
---
> memset(s2,0,sizeof *s2);
300a343,347
> long ssl2_callback_ctrl(SSL *s, int cmd, void (*fp)())
> {
> return(0);
> }
>
305a353,357
> long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
> {
> return(0);
> }
>
377c429
< MD5_Update(&ctx,(unsigned char *)&c,1);
---
> MD5_Update(&ctx,&c,1);
425a478,483
> #else /* !NO_SSL2 */
>
> # if PEDANTIC
> static void *dummy=&dummy;
> # endif
>