is a toolkit implementing the Transport Layer Security (TLS) protocols (including SSLv3) as well as a full-strength general purpose cryptographic library. Long Term Support (LTS) version (includes support for TLSv1.3).
| ssl.h (openssl-1.1.1o) | : | ssl.h (openssl-1.1.1p) |
|---|
| /* | | /* |
|
| * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. | | * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. |
| * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved | | * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved |
| * Copyright 2005 Nokia. All rights reserved. | | * Copyright 2005 Nokia. All rights reserved. |
| * | | * |
| * Licensed under the OpenSSL license (the "License"). You may not use | | * Licensed under the OpenSSL license (the "License"). You may not use |
| * this file except in compliance with the License. You can obtain a copy | | * this file except in compliance with the License. You can obtain a copy |
| * in the file LICENSE in the source distribution or at | | * in the file LICENSE in the source distribution or at |
| * https://www.openssl.org/source/license.html | | * https://www.openssl.org/source/license.html |
| */ | | */ |
| | |
| #ifndef HEADER_SSL_H | | #ifndef HEADER_SSL_H |
| | |
| skipping to change at line 1307 | | skipping to change at line 1307 |
|---|
| # define SSL_CTRL_SET_MAX_PROTO_VERSION 124 | | # define SSL_CTRL_SET_MAX_PROTO_VERSION 124 |
| # define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT 125 | | # define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT 125 |
| # define SSL_CTRL_SET_MAX_PIPELINES 126 | | # define SSL_CTRL_SET_MAX_PIPELINES 126 |
| # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE 127 | | # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE 127 |
| # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 | | # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 |
| # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 | | # define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 |
| # define SSL_CTRL_GET_MIN_PROTO_VERSION 130 | | # define SSL_CTRL_GET_MIN_PROTO_VERSION 130 |
| # define SSL_CTRL_GET_MAX_PROTO_VERSION 131 | | # define SSL_CTRL_GET_MAX_PROTO_VERSION 131 |
| # define SSL_CTRL_GET_SIGNATURE_NID 132 | | # define SSL_CTRL_GET_SIGNATURE_NID 132 |
| # define SSL_CTRL_GET_TMP_KEY 133 | | # define SSL_CTRL_GET_TMP_KEY 133 |
|
| | # define SSL_CTRL_GET_VERIFY_CERT_STORE 137 |
| | # define SSL_CTRL_GET_CHAIN_CERT_STORE 138 |
| # define SSL_CERT_SET_FIRST 1 | | # define SSL_CERT_SET_FIRST 1 |
| # define SSL_CERT_SET_NEXT 2 | | # define SSL_CERT_SET_NEXT 2 |
| # define SSL_CERT_SET_SERVER 3 | | # define SSL_CERT_SET_SERVER 3 |
| # define DTLSv1_get_timeout(ssl, arg) \ | | # define DTLSv1_get_timeout(ssl, arg) \ |
| SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)(arg)) | | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)(arg)) |
| # define DTLSv1_handle_timeout(ssl) \ | | # define DTLSv1_handle_timeout(ssl) \ |
| SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL) | | SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL) |
| # define SSL_num_renegotiations(ssl) \ | | # define SSL_num_renegotiations(ssl) \ |
| SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL) | | SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL) |
| # define SSL_clear_num_renegotiations(ssl) \ | | # define SSL_clear_num_renegotiations(ssl) \ |
| | |
| skipping to change at line 1362 | | skipping to change at line 1364 |
|---|
| # define SSL_CTX_build_cert_chain(ctx, flags) \ | | # define SSL_CTX_build_cert_chain(ctx, flags) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL) | | SSL_CTX_ctrl(ctx,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL) |
| # define SSL_CTX_select_current_cert(ctx,x509) \ | | # define SSL_CTX_select_current_cert(ctx,x509) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509)) |
| # define SSL_CTX_set_current_cert(ctx, op) \ | | # define SSL_CTX_set_current_cert(ctx, op) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL) |
| # define SSL_CTX_set0_verify_cert_store(ctx,st) \ | | # define SSL_CTX_set0_verify_cert_store(ctx,st) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) |
| # define SSL_CTX_set1_verify_cert_store(ctx,st) \ | | # define SSL_CTX_set1_verify_cert_store(ctx,st) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) |
|
| | # define SSL_CTX_get0_verify_cert_store(ctx,st) \ |
| | SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st)) |
| # define SSL_CTX_set0_chain_cert_store(ctx,st) \ | | # define SSL_CTX_set0_chain_cert_store(ctx,st) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) |
| # define SSL_CTX_set1_chain_cert_store(ctx,st) \ | | # define SSL_CTX_set1_chain_cert_store(ctx,st) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) |
|
| | # define SSL_CTX_get0_chain_cert_store(ctx,st) \ |
| | SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st)) |
| # define SSL_set0_chain(s,sk) \ | | # define SSL_set0_chain(s,sk) \ |
| SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk)) | | SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk)) |
| # define SSL_set1_chain(s,sk) \ | | # define SSL_set1_chain(s,sk) \ |
| SSL_ctrl(s,SSL_CTRL_CHAIN,1,(char *)(sk)) | | SSL_ctrl(s,SSL_CTRL_CHAIN,1,(char *)(sk)) |
| # define SSL_add0_chain_cert(s,x509) \ | | # define SSL_add0_chain_cert(s,x509) \ |
| SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,0,(char *)(x509)) | | SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,0,(char *)(x509)) |
| # define SSL_add1_chain_cert(s,x509) \ | | # define SSL_add1_chain_cert(s,x509) \ |
| SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,1,(char *)(x509)) | | SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,1,(char *)(x509)) |
| # define SSL_get0_chain_certs(s,px509) \ | | # define SSL_get0_chain_certs(s,px509) \ |
| SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERTS,0,px509) | | SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERTS,0,px509) |
| | |
| skipping to change at line 1388 | | skipping to change at line 1394 |
|---|
| # define SSL_build_cert_chain(s, flags) \ | | # define SSL_build_cert_chain(s, flags) \ |
| SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL) | | SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL) |
| # define SSL_select_current_cert(s,x509) \ | | # define SSL_select_current_cert(s,x509) \ |
| SSL_ctrl(s,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509)) | | SSL_ctrl(s,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509)) |
| # define SSL_set_current_cert(s,op) \ | | # define SSL_set_current_cert(s,op) \ |
| SSL_ctrl(s,SSL_CTRL_SET_CURRENT_CERT, op, NULL) | | SSL_ctrl(s,SSL_CTRL_SET_CURRENT_CERT, op, NULL) |
| # define SSL_set0_verify_cert_store(s,st) \ | | # define SSL_set0_verify_cert_store(s,st) \ |
| SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) | | SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st)) |
| # define SSL_set1_verify_cert_store(s,st) \ | | # define SSL_set1_verify_cert_store(s,st) \ |
| SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) | | SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st)) |
|
| | #define SSL_get0_verify_cert_store(s,st) \ |
| | SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st)) |
| # define SSL_set0_chain_cert_store(s,st) \ | | # define SSL_set0_chain_cert_store(s,st) \ |
| SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) | | SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st)) |
| # define SSL_set1_chain_cert_store(s,st) \ | | # define SSL_set1_chain_cert_store(s,st) \ |
| SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) | | SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st)) |
|
| | #define SSL_get0_chain_cert_store(s,st) \ |
| | SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st)) |
| # define SSL_get1_groups(s, glist) \ | | # define SSL_get1_groups(s, glist) \ |
| SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist)) | | SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist)) |
| # define SSL_CTX_set1_groups(ctx, glist, glistlen) \ | | # define SSL_CTX_set1_groups(ctx, glist, glistlen) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(int *)(glist)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(int *)(glist)) |
| # define SSL_CTX_set1_groups_list(ctx, s) \ | | # define SSL_CTX_set1_groups_list(ctx, s) \ |
| SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s)) | | SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s)) |
| # define SSL_set1_groups(s, glist, glistlen) \ | | # define SSL_set1_groups(s, glist, glistlen) \ |
| SSL_ctrl(s,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist)) | | SSL_ctrl(s,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist)) |
| # define SSL_set1_groups_list(s, str) \ | | # define SSL_set1_groups_list(s, str) \ |
| SSL_ctrl(s,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(str)) | | SSL_ctrl(s,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(str)) |
| | | |
| End of changes. 6 change blocks. |
|---|
| 1 lines changed or deleted | | 11 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 