diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 571ecee509..7592249dcb 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.137 2017/01/23 08:48:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.138 2017/01/23 10:22:06 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1092,7 +1092,9 @@ SSL_ctrl(SSL *s, int cmd, long larg, void *parg) | |||
1092 | return (S3I(s)->send_connection_binding); | 1092 | return (S3I(s)->send_connection_binding); |
1093 | else return (0); | 1093 | else return (0); |
1094 | default: | 1094 | default: |
1095 | return (s->method->ssl_ctrl(s, cmd, larg, parg)); | 1095 | if (SSL_IS_DTLS(s)) |
1096 | return dtls1_ctrl(s, cmd, larg, parg); | ||
1097 | return ssl3_ctrl(s, cmd, larg, parg); | ||
1096 | } | 1098 | } |
1097 | } | 1099 | } |
1098 | 1100 | ||
@@ -1107,7 +1109,7 @@ SSL_callback_ctrl(SSL *s, int cmd, void (*fp)(void)) | |||
1107 | return (1); | 1109 | return (1); |
1108 | 1110 | ||
1109 | default: | 1111 | default: |
1110 | return (s->method->ssl_callback_ctrl(s, cmd, fp)); | 1112 | return (ssl3_callback_ctrl(s, cmd, fp)); |
1111 | } | 1113 | } |
1112 | } | 1114 | } |
1113 | 1115 | ||
@@ -1192,7 +1194,7 @@ SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
1192 | ctx->internal->max_send_fragment = larg; | 1194 | ctx->internal->max_send_fragment = larg; |
1193 | return (1); | 1195 | return (1); |
1194 | default: | 1196 | default: |
1195 | return (ctx->method->ssl_ctx_ctrl(ctx, cmd, larg, parg)); | 1197 | return (ssl3_ctx_ctrl(ctx, cmd, larg, parg)); |
1196 | } | 1198 | } |
1197 | } | 1199 | } |
1198 | 1200 | ||
@@ -1207,7 +1209,7 @@ SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) | |||
1207 | return (1); | 1209 | return (1); |
1208 | 1210 | ||
1209 | default: | 1211 | default: |
1210 | return (ctx->method->ssl_ctx_callback_ctrl(ctx, cmd, fp)); | 1212 | return (ssl3_ctx_callback_ctrl(ctx, cmd, fp)); |
1211 | } | 1213 | } |
1212 | } | 1214 | } |
1213 | 1215 | ||