diff options
| author | beck <> | 2023-07-07 19:37:54 +0000 |
|---|---|---|
| committer | beck <> | 2023-07-07 19:37:54 +0000 |
| commit | 1ca8095297adf80b48019b5a2d18010ff9e3427f (patch) | |
| tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/e_camellia.c | |
| parent | 66ac57d506be0af957abeb5a5a7334a8d2a36c9b (diff) | |
| download | openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.gz openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.bz2 openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.zip | |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/evp/e_camellia.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_camellia.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c index 0ab6e9ca60..cec7649e3f 100644 --- a/src/lib/libcrypto/evp/e_camellia.c +++ b/src/lib/libcrypto/evp/e_camellia.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_camellia.c,v 1.17 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: e_camellia.c,v 1.18 2023/07/07 19:37:53 beck Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -179,7 +179,6 @@ EVP_camellia_128_cbc(void) | |||
| 179 | { | 179 | { |
| 180 | return &camellia_128_cbc; | 180 | return &camellia_128_cbc; |
| 181 | } | 181 | } |
| 182 | LCRYPTO_ALIAS(EVP_camellia_128_cbc); | ||
| 183 | 182 | ||
| 184 | static const EVP_CIPHER camellia_128_cfb128 = { | 183 | static const EVP_CIPHER camellia_128_cfb128 = { |
| 185 | .nid = NID_camellia_128_cfb128, | 184 | .nid = NID_camellia_128_cfb128, |
| @@ -202,7 +201,6 @@ EVP_camellia_128_cfb128(void) | |||
| 202 | { | 201 | { |
| 203 | return &camellia_128_cfb128; | 202 | return &camellia_128_cfb128; |
| 204 | } | 203 | } |
| 205 | LCRYPTO_ALIAS(EVP_camellia_128_cfb128); | ||
| 206 | 204 | ||
| 207 | static const EVP_CIPHER camellia_128_ofb = { | 205 | static const EVP_CIPHER camellia_128_ofb = { |
| 208 | .nid = NID_camellia_128_ofb128, | 206 | .nid = NID_camellia_128_ofb128, |
| @@ -225,7 +223,6 @@ EVP_camellia_128_ofb(void) | |||
| 225 | { | 223 | { |
| 226 | return &camellia_128_ofb; | 224 | return &camellia_128_ofb; |
| 227 | } | 225 | } |
| 228 | LCRYPTO_ALIAS(EVP_camellia_128_ofb); | ||
| 229 | 226 | ||
| 230 | static const EVP_CIPHER camellia_128_ecb = { | 227 | static const EVP_CIPHER camellia_128_ecb = { |
| 231 | .nid = NID_camellia_128_ecb, | 228 | .nid = NID_camellia_128_ecb, |
| @@ -248,7 +245,6 @@ EVP_camellia_128_ecb(void) | |||
| 248 | { | 245 | { |
| 249 | return &camellia_128_ecb; | 246 | return &camellia_128_ecb; |
| 250 | } | 247 | } |
| 251 | LCRYPTO_ALIAS(EVP_camellia_128_ecb); | ||
| 252 | 248 | ||
| 253 | static int | 249 | static int |
| 254 | camellia_192_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 250 | camellia_192_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -341,7 +337,6 @@ EVP_camellia_192_cbc(void) | |||
| 341 | { | 337 | { |
| 342 | return &camellia_192_cbc; | 338 | return &camellia_192_cbc; |
| 343 | } | 339 | } |
| 344 | LCRYPTO_ALIAS(EVP_camellia_192_cbc); | ||
| 345 | 340 | ||
| 346 | static const EVP_CIPHER camellia_192_cfb128 = { | 341 | static const EVP_CIPHER camellia_192_cfb128 = { |
| 347 | .nid = NID_camellia_192_cfb128, | 342 | .nid = NID_camellia_192_cfb128, |
| @@ -364,7 +359,6 @@ EVP_camellia_192_cfb128(void) | |||
| 364 | { | 359 | { |
| 365 | return &camellia_192_cfb128; | 360 | return &camellia_192_cfb128; |
| 366 | } | 361 | } |
| 367 | LCRYPTO_ALIAS(EVP_camellia_192_cfb128); | ||
| 368 | 362 | ||
| 369 | static const EVP_CIPHER camellia_192_ofb = { | 363 | static const EVP_CIPHER camellia_192_ofb = { |
| 370 | .nid = NID_camellia_192_ofb128, | 364 | .nid = NID_camellia_192_ofb128, |
| @@ -387,7 +381,6 @@ EVP_camellia_192_ofb(void) | |||
| 387 | { | 381 | { |
| 388 | return &camellia_192_ofb; | 382 | return &camellia_192_ofb; |
| 389 | } | 383 | } |
| 390 | LCRYPTO_ALIAS(EVP_camellia_192_ofb); | ||
| 391 | 384 | ||
| 392 | static const EVP_CIPHER camellia_192_ecb = { | 385 | static const EVP_CIPHER camellia_192_ecb = { |
| 393 | .nid = NID_camellia_192_ecb, | 386 | .nid = NID_camellia_192_ecb, |
| @@ -410,7 +403,6 @@ EVP_camellia_192_ecb(void) | |||
| 410 | { | 403 | { |
| 411 | return &camellia_192_ecb; | 404 | return &camellia_192_ecb; |
| 412 | } | 405 | } |
| 413 | LCRYPTO_ALIAS(EVP_camellia_192_ecb); | ||
| 414 | 406 | ||
| 415 | static int | 407 | static int |
| 416 | camellia_256_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 408 | camellia_256_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -503,7 +495,6 @@ EVP_camellia_256_cbc(void) | |||
| 503 | { | 495 | { |
| 504 | return &camellia_256_cbc; | 496 | return &camellia_256_cbc; |
| 505 | } | 497 | } |
| 506 | LCRYPTO_ALIAS(EVP_camellia_256_cbc); | ||
| 507 | 498 | ||
| 508 | static const EVP_CIPHER camellia_256_cfb128 = { | 499 | static const EVP_CIPHER camellia_256_cfb128 = { |
| 509 | .nid = NID_camellia_256_cfb128, | 500 | .nid = NID_camellia_256_cfb128, |
| @@ -526,7 +517,6 @@ EVP_camellia_256_cfb128(void) | |||
| 526 | { | 517 | { |
| 527 | return &camellia_256_cfb128; | 518 | return &camellia_256_cfb128; |
| 528 | } | 519 | } |
| 529 | LCRYPTO_ALIAS(EVP_camellia_256_cfb128); | ||
| 530 | 520 | ||
| 531 | static const EVP_CIPHER camellia_256_ofb = { | 521 | static const EVP_CIPHER camellia_256_ofb = { |
| 532 | .nid = NID_camellia_256_ofb128, | 522 | .nid = NID_camellia_256_ofb128, |
| @@ -549,7 +539,6 @@ EVP_camellia_256_ofb(void) | |||
| 549 | { | 539 | { |
| 550 | return &camellia_256_ofb; | 540 | return &camellia_256_ofb; |
| 551 | } | 541 | } |
| 552 | LCRYPTO_ALIAS(EVP_camellia_256_ofb); | ||
| 553 | 542 | ||
| 554 | static const EVP_CIPHER camellia_256_ecb = { | 543 | static const EVP_CIPHER camellia_256_ecb = { |
| 555 | .nid = NID_camellia_256_ecb, | 544 | .nid = NID_camellia_256_ecb, |
| @@ -572,7 +561,6 @@ EVP_camellia_256_ecb(void) | |||
| 572 | { | 561 | { |
| 573 | return &camellia_256_ecb; | 562 | return &camellia_256_ecb; |
| 574 | } | 563 | } |
| 575 | LCRYPTO_ALIAS(EVP_camellia_256_ecb); | ||
| 576 | 564 | ||
| 577 | static int | 565 | static int |
| 578 | camellia_128_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 566 | camellia_128_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -617,7 +605,6 @@ EVP_camellia_128_cfb1(void) | |||
| 617 | { | 605 | { |
| 618 | return &camellia_128_cfb1; | 606 | return &camellia_128_cfb1; |
| 619 | } | 607 | } |
| 620 | LCRYPTO_ALIAS(EVP_camellia_128_cfb1); | ||
| 621 | 608 | ||
| 622 | static int | 609 | static int |
| 623 | camellia_192_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 610 | camellia_192_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -662,7 +649,6 @@ EVP_camellia_192_cfb1(void) | |||
| 662 | { | 649 | { |
| 663 | return &camellia_192_cfb1; | 650 | return &camellia_192_cfb1; |
| 664 | } | 651 | } |
| 665 | LCRYPTO_ALIAS(EVP_camellia_192_cfb1); | ||
| 666 | 652 | ||
| 667 | static int | 653 | static int |
| 668 | camellia_256_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 654 | camellia_256_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -707,7 +693,6 @@ EVP_camellia_256_cfb1(void) | |||
| 707 | { | 693 | { |
| 708 | return &camellia_256_cfb1; | 694 | return &camellia_256_cfb1; |
| 709 | } | 695 | } |
| 710 | LCRYPTO_ALIAS(EVP_camellia_256_cfb1); | ||
| 711 | 696 | ||
| 712 | 697 | ||
| 713 | static int | 698 | static int |
| @@ -751,7 +736,6 @@ EVP_camellia_128_cfb8(void) | |||
| 751 | { | 736 | { |
| 752 | return &camellia_128_cfb8; | 737 | return &camellia_128_cfb8; |
| 753 | } | 738 | } |
| 754 | LCRYPTO_ALIAS(EVP_camellia_128_cfb8); | ||
| 755 | 739 | ||
| 756 | static int | 740 | static int |
| 757 | camellia_192_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 741 | camellia_192_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -794,7 +778,6 @@ EVP_camellia_192_cfb8(void) | |||
| 794 | { | 778 | { |
| 795 | return &camellia_192_cfb8; | 779 | return &camellia_192_cfb8; |
| 796 | } | 780 | } |
| 797 | LCRYPTO_ALIAS(EVP_camellia_192_cfb8); | ||
| 798 | 781 | ||
| 799 | static int | 782 | static int |
| 800 | camellia_256_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) | 783 | camellia_256_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) |
| @@ -837,5 +820,4 @@ EVP_camellia_256_cfb8(void) | |||
| 837 | { | 820 | { |
| 838 | return &camellia_256_cfb8; | 821 | return &camellia_256_cfb8; |
| 839 | } | 822 | } |
| 840 | LCRYPTO_ALIAS(EVP_camellia_256_cfb8); | ||
| 841 | #endif | 823 | #endif |
