diff options
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 173e217c8f..c735547393 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.91 2022/01/07 16:45:06 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.92 2022/01/08 12:43:44 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 | * |
| @@ -158,12 +158,12 @@ SSL_get_ex_data_X509_STORE_CTX_idx(void) | |||
| 158 | return ssl_x509_store_ctx_idx; | 158 | return ssl_x509_store_ctx_idx; |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | CERT * | 161 | SSL_CERT * |
| 162 | ssl_cert_new(void) | 162 | ssl_cert_new(void) |
| 163 | { | 163 | { |
| 164 | CERT *ret; | 164 | SSL_CERT *ret; |
| 165 | 165 | ||
| 166 | ret = calloc(1, sizeof(CERT)); | 166 | ret = calloc(1, sizeof(SSL_CERT)); |
| 167 | if (ret == NULL) { | 167 | if (ret == NULL) { |
| 168 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 168 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
| 169 | return (NULL); | 169 | return (NULL); |
| @@ -173,13 +173,13 @@ ssl_cert_new(void) | |||
| 173 | return (ret); | 173 | return (ret); |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | CERT * | 176 | SSL_CERT * |
| 177 | ssl_cert_dup(CERT *cert) | 177 | ssl_cert_dup(SSL_CERT *cert) |
| 178 | { | 178 | { |
| 179 | CERT *ret; | 179 | SSL_CERT *ret; |
| 180 | int i; | 180 | int i; |
| 181 | 181 | ||
| 182 | ret = calloc(1, sizeof(CERT)); | 182 | ret = calloc(1, sizeof(SSL_CERT)); |
| 183 | if (ret == NULL) { | 183 | if (ret == NULL) { |
| 184 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 184 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
| 185 | return (NULL); | 185 | return (NULL); |
| @@ -269,7 +269,7 @@ ssl_cert_dup(CERT *cert) | |||
| 269 | 269 | ||
| 270 | 270 | ||
| 271 | void | 271 | void |
| 272 | ssl_cert_free(CERT *c) | 272 | ssl_cert_free(SSL_CERT *c) |
| 273 | { | 273 | { |
| 274 | int i; | 274 | int i; |
| 275 | 275 | ||
| @@ -292,7 +292,7 @@ ssl_cert_free(CERT *c) | |||
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | int | 294 | int |
| 295 | ssl_cert_set0_chain(CERT *c, STACK_OF(X509) *chain) | 295 | ssl_cert_set0_chain(SSL_CERT *c, STACK_OF(X509) *chain) |
| 296 | { | 296 | { |
| 297 | if (c->key == NULL) | 297 | if (c->key == NULL) |
| 298 | return 0; | 298 | return 0; |
| @@ -304,7 +304,7 @@ ssl_cert_set0_chain(CERT *c, STACK_OF(X509) *chain) | |||
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | int | 306 | int |
| 307 | ssl_cert_set1_chain(CERT *c, STACK_OF(X509) *chain) | 307 | ssl_cert_set1_chain(SSL_CERT *c, STACK_OF(X509) *chain) |
| 308 | { | 308 | { |
| 309 | STACK_OF(X509) *new_chain = NULL; | 309 | STACK_OF(X509) *new_chain = NULL; |
| 310 | 310 | ||
| @@ -321,7 +321,7 @@ ssl_cert_set1_chain(CERT *c, STACK_OF(X509) *chain) | |||
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | int | 323 | int |
| 324 | ssl_cert_add0_chain_cert(CERT *c, X509 *cert) | 324 | ssl_cert_add0_chain_cert(SSL_CERT *c, X509 *cert) |
| 325 | { | 325 | { |
| 326 | if (c->key == NULL) | 326 | if (c->key == NULL) |
| 327 | return 0; | 327 | return 0; |
| @@ -337,7 +337,7 @@ ssl_cert_add0_chain_cert(CERT *c, X509 *cert) | |||
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | int | 339 | int |
| 340 | ssl_cert_add1_chain_cert(CERT *c, X509 *cert) | 340 | ssl_cert_add1_chain_cert(SSL_CERT *c, X509 *cert) |
| 341 | { | 341 | { |
| 342 | if (!ssl_cert_add0_chain_cert(c, cert)) | 342 | if (!ssl_cert_add0_chain_cert(c, cert)) |
| 343 | return 0; | 343 | return 0; |
