diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 7561060120..7ab6880131 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_lib.c,v 1.245 2023/07/02 17:21:32 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.246 2023/07/08 16:40:13 beck 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 | * |
| @@ -1931,24 +1931,28 @@ SSL_set0_chain(SSL *ssl, STACK_OF(X509) *chain) | |||
| 1931 | { | 1931 | { |
| 1932 | return ssl_cert_set0_chain(NULL, ssl, chain); | 1932 | return ssl_cert_set0_chain(NULL, ssl, chain); |
| 1933 | } | 1933 | } |
| 1934 | LSSL_ALIAS(SSL_set0_chain); | ||
| 1934 | 1935 | ||
| 1935 | int | 1936 | int |
| 1936 | SSL_set1_chain(SSL *ssl, STACK_OF(X509) *chain) | 1937 | SSL_set1_chain(SSL *ssl, STACK_OF(X509) *chain) |
| 1937 | { | 1938 | { |
| 1938 | return ssl_cert_set1_chain(NULL, ssl, chain); | 1939 | return ssl_cert_set1_chain(NULL, ssl, chain); |
| 1939 | } | 1940 | } |
| 1941 | LSSL_ALIAS(SSL_set1_chain); | ||
| 1940 | 1942 | ||
| 1941 | int | 1943 | int |
| 1942 | SSL_add0_chain_cert(SSL *ssl, X509 *x509) | 1944 | SSL_add0_chain_cert(SSL *ssl, X509 *x509) |
| 1943 | { | 1945 | { |
| 1944 | return ssl_cert_add0_chain_cert(NULL, ssl, x509); | 1946 | return ssl_cert_add0_chain_cert(NULL, ssl, x509); |
| 1945 | } | 1947 | } |
| 1948 | LSSL_ALIAS(SSL_add0_chain_cert); | ||
| 1946 | 1949 | ||
| 1947 | int | 1950 | int |
| 1948 | SSL_add1_chain_cert(SSL *ssl, X509 *x509) | 1951 | SSL_add1_chain_cert(SSL *ssl, X509 *x509) |
| 1949 | { | 1952 | { |
| 1950 | return ssl_cert_add1_chain_cert(NULL, ssl, x509); | 1953 | return ssl_cert_add1_chain_cert(NULL, ssl, x509); |
| 1951 | } | 1954 | } |
| 1955 | LSSL_ALIAS(SSL_add1_chain_cert); | ||
| 1952 | 1956 | ||
| 1953 | int | 1957 | int |
| 1954 | SSL_get0_chain_certs(const SSL *ssl, STACK_OF(X509) **out_chain) | 1958 | SSL_get0_chain_certs(const SSL *ssl, STACK_OF(X509) **out_chain) |
| @@ -1960,12 +1964,14 @@ SSL_get0_chain_certs(const SSL *ssl, STACK_OF(X509) **out_chain) | |||
| 1960 | 1964 | ||
| 1961 | return 1; | 1965 | return 1; |
| 1962 | } | 1966 | } |
| 1967 | LSSL_ALIAS(SSL_get0_chain_certs); | ||
| 1963 | 1968 | ||
| 1964 | int | 1969 | int |
| 1965 | SSL_clear_chain_certs(SSL *ssl) | 1970 | SSL_clear_chain_certs(SSL *ssl) |
| 1966 | { | 1971 | { |
| 1967 | return ssl_cert_set0_chain(NULL, ssl, NULL); | 1972 | return ssl_cert_set0_chain(NULL, ssl, NULL); |
| 1968 | } | 1973 | } |
| 1974 | LSSL_ALIAS(SSL_clear_chain_certs); | ||
| 1969 | 1975 | ||
| 1970 | int | 1976 | int |
| 1971 | SSL_set1_groups(SSL *s, const int *groups, size_t groups_len) | 1977 | SSL_set1_groups(SSL *s, const int *groups, size_t groups_len) |
| @@ -1973,6 +1979,7 @@ SSL_set1_groups(SSL *s, const int *groups, size_t groups_len) | |||
| 1973 | return tls1_set_groups(&s->tlsext_supportedgroups, | 1979 | return tls1_set_groups(&s->tlsext_supportedgroups, |
| 1974 | &s->tlsext_supportedgroups_length, groups, groups_len); | 1980 | &s->tlsext_supportedgroups_length, groups, groups_len); |
| 1975 | } | 1981 | } |
| 1982 | LSSL_ALIAS(SSL_set1_groups); | ||
| 1976 | 1983 | ||
| 1977 | int | 1984 | int |
| 1978 | SSL_set1_groups_list(SSL *s, const char *groups) | 1985 | SSL_set1_groups_list(SSL *s, const char *groups) |
| @@ -1980,6 +1987,7 @@ SSL_set1_groups_list(SSL *s, const char *groups) | |||
| 1980 | return tls1_set_group_list(&s->tlsext_supportedgroups, | 1987 | return tls1_set_group_list(&s->tlsext_supportedgroups, |
| 1981 | &s->tlsext_supportedgroups_length, groups); | 1988 | &s->tlsext_supportedgroups_length, groups); |
| 1982 | } | 1989 | } |
| 1990 | LSSL_ALIAS(SSL_set1_groups_list); | ||
| 1983 | 1991 | ||
| 1984 | static int | 1992 | static int |
| 1985 | _SSL_get_signature_nid(SSL *s, int *nid) | 1993 | _SSL_get_signature_nid(SSL *s, int *nid) |
| @@ -2322,24 +2330,28 @@ SSL_CTX_set0_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) | |||
| 2322 | { | 2330 | { |
| 2323 | return ssl_cert_set0_chain(ctx, NULL, chain); | 2331 | return ssl_cert_set0_chain(ctx, NULL, chain); |
| 2324 | } | 2332 | } |
| 2333 | LSSL_ALIAS(SSL_CTX_set0_chain); | ||
| 2325 | 2334 | ||
| 2326 | int | 2335 | int |
| 2327 | SSL_CTX_set1_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) | 2336 | SSL_CTX_set1_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) |
| 2328 | { | 2337 | { |
| 2329 | return ssl_cert_set1_chain(ctx, NULL, chain); | 2338 | return ssl_cert_set1_chain(ctx, NULL, chain); |
| 2330 | } | 2339 | } |
| 2340 | LSSL_ALIAS(SSL_CTX_set1_chain); | ||
| 2331 | 2341 | ||
| 2332 | int | 2342 | int |
| 2333 | SSL_CTX_add0_chain_cert(SSL_CTX *ctx, X509 *x509) | 2343 | SSL_CTX_add0_chain_cert(SSL_CTX *ctx, X509 *x509) |
| 2334 | { | 2344 | { |
| 2335 | return ssl_cert_add0_chain_cert(ctx, NULL, x509); | 2345 | return ssl_cert_add0_chain_cert(ctx, NULL, x509); |
| 2336 | } | 2346 | } |
| 2347 | LSSL_ALIAS(SSL_CTX_add0_chain_cert); | ||
| 2337 | 2348 | ||
| 2338 | int | 2349 | int |
| 2339 | SSL_CTX_add1_chain_cert(SSL_CTX *ctx, X509 *x509) | 2350 | SSL_CTX_add1_chain_cert(SSL_CTX *ctx, X509 *x509) |
| 2340 | { | 2351 | { |
| 2341 | return ssl_cert_add1_chain_cert(ctx, NULL, x509); | 2352 | return ssl_cert_add1_chain_cert(ctx, NULL, x509); |
| 2342 | } | 2353 | } |
| 2354 | LSSL_ALIAS(SSL_CTX_add1_chain_cert); | ||
| 2343 | 2355 | ||
| 2344 | int | 2356 | int |
| 2345 | SSL_CTX_get0_chain_certs(const SSL_CTX *ctx, STACK_OF(X509) **out_chain) | 2357 | SSL_CTX_get0_chain_certs(const SSL_CTX *ctx, STACK_OF(X509) **out_chain) |
| @@ -2351,12 +2363,14 @@ SSL_CTX_get0_chain_certs(const SSL_CTX *ctx, STACK_OF(X509) **out_chain) | |||
| 2351 | 2363 | ||
| 2352 | return 1; | 2364 | return 1; |
| 2353 | } | 2365 | } |
| 2366 | LSSL_ALIAS(SSL_CTX_get0_chain_certs); | ||
| 2354 | 2367 | ||
| 2355 | int | 2368 | int |
| 2356 | SSL_CTX_clear_chain_certs(SSL_CTX *ctx) | 2369 | SSL_CTX_clear_chain_certs(SSL_CTX *ctx) |
| 2357 | { | 2370 | { |
| 2358 | return ssl_cert_set0_chain(ctx, NULL, NULL); | 2371 | return ssl_cert_set0_chain(ctx, NULL, NULL); |
| 2359 | } | 2372 | } |
| 2373 | LSSL_ALIAS(SSL_CTX_clear_chain_certs); | ||
| 2360 | 2374 | ||
| 2361 | static int | 2375 | static int |
| 2362 | _SSL_CTX_add_extra_chain_cert(SSL_CTX *ctx, X509 *cert) | 2376 | _SSL_CTX_add_extra_chain_cert(SSL_CTX *ctx, X509 *cert) |
| @@ -2402,6 +2416,7 @@ SSL_CTX_set1_groups(SSL_CTX *ctx, const int *groups, size_t groups_len) | |||
| 2402 | return tls1_set_groups(&ctx->tlsext_supportedgroups, | 2416 | return tls1_set_groups(&ctx->tlsext_supportedgroups, |
| 2403 | &ctx->tlsext_supportedgroups_length, groups, groups_len); | 2417 | &ctx->tlsext_supportedgroups_length, groups, groups_len); |
| 2404 | } | 2418 | } |
| 2419 | LSSL_ALIAS(SSL_CTX_set1_groups); | ||
| 2405 | 2420 | ||
| 2406 | int | 2421 | int |
| 2407 | SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups) | 2422 | SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups) |
| @@ -2409,6 +2424,7 @@ SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups) | |||
| 2409 | return tls1_set_group_list(&ctx->tlsext_supportedgroups, | 2424 | return tls1_set_group_list(&ctx->tlsext_supportedgroups, |
| 2410 | &ctx->tlsext_supportedgroups_length, groups); | 2425 | &ctx->tlsext_supportedgroups_length, groups); |
| 2411 | } | 2426 | } |
| 2427 | LSSL_ALIAS(SSL_CTX_set1_groups_list); | ||
| 2412 | 2428 | ||
| 2413 | long | 2429 | long |
| 2414 | ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | 2430 | ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) |
