summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_asn1.c
diff options
context:
space:
mode:
authorbeck <>2014-04-17 13:37:50 +0000
committerbeck <>2014-04-17 13:37:50 +0000
commitbddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch)
tree7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libssl/ssl_asn1.c
parentecec66222d758996a4ff2671ca5026d9ede5ef76 (diff)
downloadopenbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.gz
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.bz2
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.zip
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes: OPENSSL_malloc->malloc OPENSSL_free->free OPENSSL_relloc->realloc OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libssl/ssl_asn1.c')
-rw-r--r--src/lib/libssl/ssl_asn1.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index 28e295f6a4..60ee189f29 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -145,7 +145,7 @@ i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
145 145
146 /* Note that I cheat in the following 2 assignments. I know 146 /* Note that I cheat in the following 2 assignments. I know
147 * that if the ASN1_INTEGER passed to ASN1_INTEGER_set 147 * that if the ASN1_INTEGER passed to ASN1_INTEGER_set
148 * is > sizeof(long)+1, the buffer will not be re-OPENSSL_malloc()ed. 148 * is > sizeof(long)+1, the buffer will not be re-malloc()ed.
149 * This is a bit evil but makes things simple, no dynamic allocation 149 * This is a bit evil but makes things simple, no dynamic allocation
150 * to clean up :-) */ 150 * to clean up :-) */
151 a.version.length = LSIZE2; 151 a.version.length = LSIZE2;
@@ -375,7 +375,7 @@ long length)
375 ai.length = 0; 375 ai.length = 0;
376 M_ASN1_D2I_get_x(ASN1_INTEGER, aip, d2i_ASN1_INTEGER); 376 M_ASN1_D2I_get_x(ASN1_INTEGER, aip, d2i_ASN1_INTEGER);
377 if (ai.data != NULL) { 377 if (ai.data != NULL) {
378 OPENSSL_free(ai.data); 378 free(ai.data);
379 ai.data = NULL; 379 ai.data = NULL;
380 ai.length = 0; 380 ai.length = 0;
381 } 381 }
@@ -385,7 +385,7 @@ long length)
385 ssl_version = (int)ASN1_INTEGER_get(aip); 385 ssl_version = (int)ASN1_INTEGER_get(aip);
386 ret->ssl_version = ssl_version; 386 ret->ssl_version = ssl_version;
387 if (ai.data != NULL) { 387 if (ai.data != NULL) {
388 OPENSSL_free(ai.data); 388 free(ai.data);
389 ai.data = NULL; 389 ai.data = NULL;
390 ai.length = 0; 390 ai.length = 0;
391 } 391 }
@@ -439,7 +439,7 @@ long length)
439 else 439 else
440 ret->krb5_client_princ_len = os.length; 440 ret->krb5_client_princ_len = os.length;
441 memcpy(ret->krb5_client_princ, os.data, ret->krb5_client_princ_len); 441 memcpy(ret->krb5_client_princ, os.data, ret->krb5_client_princ_len);
442 OPENSSL_free(os.data); 442 free(os.data);
443 os.data = NULL; 443 os.data = NULL;
444 os.length = 0; 444 os.length = 0;
445 } else 445 } else
@@ -453,13 +453,13 @@ long length)
453 ret->key_arg_length = os.length; 453 ret->key_arg_length = os.length;
454 memcpy(ret->key_arg, os.data, ret->key_arg_length); 454 memcpy(ret->key_arg, os.data, ret->key_arg_length);
455 if (os.data != NULL) 455 if (os.data != NULL)
456 OPENSSL_free(os.data); 456 free(os.data);
457 457
458 ai.length = 0; 458 ai.length = 0;
459 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 1); 459 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 1);
460 if (ai.data != NULL) { 460 if (ai.data != NULL) {
461 ret->time = ASN1_INTEGER_get(aip); 461 ret->time = ASN1_INTEGER_get(aip);
462 OPENSSL_free(ai.data); 462 free(ai.data);
463 ai.data = NULL; 463 ai.data = NULL;
464 ai.length = 0; 464 ai.length = 0;
465 } else 465 } else
@@ -469,7 +469,7 @@ long length)
469 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 2); 469 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 2);
470 if (ai.data != NULL) { 470 if (ai.data != NULL) {
471 ret->timeout = ASN1_INTEGER_get(aip); 471 ret->timeout = ASN1_INTEGER_get(aip);
472 OPENSSL_free(ai.data); 472 free(ai.data);
473 ai.data = NULL; 473 ai.data = NULL;
474 ai.length = 0; 474 ai.length = 0;
475 } else 475 } else
@@ -493,7 +493,7 @@ long length)
493 ret->sid_ctx_length = os.length; 493 ret->sid_ctx_length = os.length;
494 memcpy(ret->sid_ctx, os.data, os.length); 494 memcpy(ret->sid_ctx, os.data, os.length);
495 } 495 }
496 OPENSSL_free(os.data); 496 free(os.data);
497 os.data = NULL; 497 os.data = NULL;
498 os.length = 0; 498 os.length = 0;
499 } else 499 } else
@@ -503,7 +503,7 @@ long length)
503 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 5); 503 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 5);
504 if (ai.data != NULL) { 504 if (ai.data != NULL) {
505 ret->verify_result = ASN1_INTEGER_get(aip); 505 ret->verify_result = ASN1_INTEGER_get(aip);
506 OPENSSL_free(ai.data); 506 free(ai.data);
507 ai.data = NULL; 507 ai.data = NULL;
508 ai.length = 0; 508 ai.length = 0;
509 } else 509 } else
@@ -515,7 +515,7 @@ long length)
515 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 6); 515 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 6);
516 if (os.data) { 516 if (os.data) {
517 ret->tlsext_hostname = BUF_strndup((char *)os.data, os.length); 517 ret->tlsext_hostname = BUF_strndup((char *)os.data, os.length);
518 OPENSSL_free(os.data); 518 free(os.data);
519 os.data = NULL; 519 os.data = NULL;
520 os.length = 0; 520 os.length = 0;
521 } else 521 } else
@@ -528,7 +528,7 @@ long length)
528 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 7); 528 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 7);
529 if (os.data) { 529 if (os.data) {
530 ret->psk_identity_hint = BUF_strndup((char *)os.data, os.length); 530 ret->psk_identity_hint = BUF_strndup((char *)os.data, os.length);
531 OPENSSL_free(os.data); 531 free(os.data);
532 os.data = NULL; 532 os.data = NULL;
533 os.length = 0; 533 os.length = 0;
534 } else 534 } else
@@ -539,7 +539,7 @@ long length)
539 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 8); 539 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 8);
540 if (os.data) { 540 if (os.data) {
541 ret->psk_identity = BUF_strndup((char *)os.data, os.length); 541 ret->psk_identity = BUF_strndup((char *)os.data, os.length);
542 OPENSSL_free(os.data); 542 free(os.data);
543 os.data = NULL; 543 os.data = NULL;
544 os.length = 0; 544 os.length = 0;
545 } else 545 } else
@@ -551,7 +551,7 @@ long length)
551 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 9); 551 M_ASN1_D2I_get_EXP_opt(aip, d2i_ASN1_INTEGER, 9);
552 if (ai.data != NULL) { 552 if (ai.data != NULL) {
553 ret->tlsext_tick_lifetime_hint = ASN1_INTEGER_get(aip); 553 ret->tlsext_tick_lifetime_hint = ASN1_INTEGER_get(aip);
554 OPENSSL_free(ai.data); 554 free(ai.data);
555 ai.data = NULL; 555 ai.data = NULL;
556 ai.length = 0; 556 ai.length = 0;
557 } else if (ret->tlsext_ticklen && ret->session_id_length) 557 } else if (ret->tlsext_ticklen && ret->session_id_length)
@@ -575,7 +575,7 @@ long length)
575 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 11); 575 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 11);
576 if (os.data) { 576 if (os.data) {
577 ret->compress_meth = os.data[0]; 577 ret->compress_meth = os.data[0];
578 OPENSSL_free(os.data); 578 free(os.data);
579 os.data = NULL; 579 os.data = NULL;
580 } 580 }
581#endif 581#endif
@@ -586,7 +586,7 @@ long length)
586 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 12); 586 M_ASN1_D2I_get_EXP_opt(osp, d2i_ASN1_OCTET_STRING, 12);
587 if (os.data) { 587 if (os.data) {
588 ret->srp_username = BUF_strndup((char *)os.data, os.length); 588 ret->srp_username = BUF_strndup((char *)os.data, os.length);
589 OPENSSL_free(os.data); 589 free(os.data);
590 os.data = NULL; 590 os.data = NULL;
591 os.length = 0; 591 os.length = 0;
592 } else 592 } else
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 03:02:06 +0000