aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-04-26 16:43:10 +0000
committerUlf Möller <ulf@openssl.org>1999-04-26 16:43:10 +0000
commita9be3af5ad4836f7e50f0546311ca90c717b861e (patch)
treef44f7f8c4497d85da4c5cbd08067479bb20ced95 /ssl/s3_lib.c
parent47339f6179fbefafc793c10b0411ed0365497d65 (diff)
downloadopenssl-a9be3af5ad4836f7e50f0546311ca90c717b861e.tar.gz
Remove NOPROTO definitions and error code comments.
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 14f6ac4fa6..d21772ec93 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -64,12 +64,7 @@ const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
-#ifndef NOPROTO
static long ssl3_default_timeout(void );
-#else
-static long ssl3_default_timeout();
-#endif
-
SSL_CIPHER ssl3_ciphers[]={
/* The RSA ciphers */
/* Cipher 01 */
@@ -640,11 +635,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
}
break;
case SSL_CTRL_SET_TMP_RSA_CB:
-#ifndef NOPROTO
s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))parg;
-#else
- s->cert->rsa_tmp_cb = (RSA *(*)())parg;
-#endif
break;
#endif
#ifndef NO_DH
@@ -671,11 +662,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
}
break;
case SSL_CTRL_SET_TMP_DH_CB:
-#ifndef NOPROTO
s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))parg;
-#else
- s->cert->dh_tmp_cb = (DH *(*)())parg;
-#endif
break;
#endif
default:
@@ -731,11 +718,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, 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
@@ -762,11 +745,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, 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 :-) */