diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-02-22 01:26:40 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-02-22 01:26:40 +0000 |
| commit | e527ba09a66837cad0d8973409e660474db63f89 (patch) | |
| tree | 9cafa6c8c7d85d4e5cb1957b995ffa815745915d /ssl | |
| parent | 60e31c3a4bbdbdb4259eaa3c48639f3e3915f380 (diff) | |
Various changes to make this stuff compile under Win32 and VC++ with and
without -debug option to mk1mf.pl. Change _export to is_export (_export is
a reserved word under VC++). Add yucky function prototype function pointer
casts. Sanitise the included files in crypto/x509v3.
Also changed ssleay.exe target to openssl.exe
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 8 | ||||
| -rw-r--r-- | ssl/ssl_ciph.c | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index b6f5d82f21..b7bcf86476 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -623,7 +623,11 @@ char *parg; } /* break; */ case SSL_CTRL_SET_TMP_RSA_CB: +#ifndef NOPROTO + cert->rsa_tmp_cb=(RSA *(*)(SSL *, int, int))parg; +#else cert->rsa_tmp_cb=(RSA *(*)())parg; +#endif break; #endif #ifndef NO_DH @@ -650,7 +654,11 @@ char *parg; } /*break; */ case SSL_CTRL_SET_TMP_DH_CB: +#ifndef NOPROTO + cert->dh_tmp_cb=(DH *(*)(SSL *, int, int))parg; +#else cert->dh_tmp_cb=(DH *(*)())parg; +#endif break; #endif /* A Thawte special :-) */ diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index d558794c33..0e9d97aaf0 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -616,7 +616,7 @@ SSL_CIPHER *cipher; char *buf; int len; { - int _export,pkl,kl; + int is_export,pkl,kl;
char *ver,*exp; char *kx,*au,*enc,*mac; unsigned long alg,alg2; @@ -625,10 +625,10 @@ int len; alg=cipher->algorithms; alg2=cipher->algorithm2; - _export=SSL_IS_EXPORT(alg); + is_export=SSL_IS_EXPORT(alg);
pkl=SSL_EXPORT_PKEYLENGTH(alg); kl=SSL_EXPORT_KEYLENGTH(alg); - exp=_export?" export":""; + exp=is_export?" export":"";
if (alg & SSL_SSLV2) ver="SSLv2"; @@ -640,7 +640,7 @@ int len; switch (alg&SSL_MKEY_MASK) { case SSL_kRSA: - kx=_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA"; + kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
break; case SSL_kDHr: kx="DH/RSA"; @@ -652,7 +652,7 @@ int len; kx="Fortezza"; break; case SSL_kEDH: - kx=_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH"; + kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
break; default: kx="unknown"; @@ -681,17 +681,17 @@ int len; switch (alg&SSL_ENC_MASK) { case SSL_DES: - enc=(_export && kl == 5)?"DES(40)":"DES(56)"; + enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
break; case SSL_3DES: enc="3DES(168)"; break; case SSL_RC4: - enc=_export?(kl == 5 ? "RC4(40)" : "RC4(56)") + enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
:((alg2&SSL2_CF_8_BYTE_ENC)?"RC4(64)":"RC4(128)"); break; case SSL_RC2: - enc=_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)"; + enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
break; case SSL_IDEA: enc="IDEA(128)"; |