diff options
author | jsing <> | 2023-04-19 10:54:49 +0000 |
---|---|---|
committer | jsing <> | 2023-04-19 10:54:49 +0000 |
commit | 6c3e0c3223daccef49e16bf91e624f6ad33f96e7 (patch) | |
tree | ca58e21d0a2e0571e8ee2546e7db2eb1bb63d4a3 /src/lib | |
parent | 0954bbaddbf74f6f184f313822c63bf1b56695bd (diff) | |
download | openbsd-6c3e0c3223daccef49e16bf91e624f6ad33f96e7.tar.gz openbsd-6c3e0c3223daccef49e16bf91e624f6ad33f96e7.tar.bz2 openbsd-6c3e0c3223daccef49e16bf91e624f6ad33f96e7.zip |
Move BN_options() from bn_convert.c to bn_lib.c
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/bn/bn_convert.c | 21 | ||||
-rw-r--r-- | src/lib/libcrypto/bn/bn_lib.c | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/bn/bn_convert.c b/src/lib/libcrypto/bn/bn_convert.c index ab6c7924f1..20bea92218 100644 --- a/src/lib/libcrypto/bn/bn_convert.c +++ b/src/lib/libcrypto/bn/bn_convert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_convert.c,v 1.2 2023/04/17 12:36:59 jsing Exp $ */ | 1 | /* $OpenBSD: bn_convert.c,v 1.3 2023/04/19 10:54:49 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 | * |
@@ -465,22 +465,3 @@ end: | |||
465 | return (ret); | 465 | return (ret); |
466 | } | 466 | } |
467 | #endif | 467 | #endif |
468 | |||
469 | char * | ||
470 | BN_options(void) | ||
471 | { | ||
472 | static int init = 0; | ||
473 | static char data[16]; | ||
474 | |||
475 | if (!init) { | ||
476 | init++; | ||
477 | #ifdef BN_LLONG | ||
478 | snprintf(data,sizeof data, "bn(%d,%d)", | ||
479 | (int)sizeof(BN_ULLONG) * 8, (int)sizeof(BN_ULONG) * 8); | ||
480 | #else | ||
481 | snprintf(data,sizeof data, "bn(%d,%d)", | ||
482 | (int)sizeof(BN_ULONG) * 8, (int)sizeof(BN_ULONG) * 8); | ||
483 | #endif | ||
484 | } | ||
485 | return (data); | ||
486 | } | ||
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c index 89664fbb97..cd06563a5d 100644 --- a/src/lib/libcrypto/bn/bn_lib.c +++ b/src/lib/libcrypto/bn/bn_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_lib.c,v 1.82 2023/04/19 10:51:22 jsing Exp $ */ | 1 | /* $OpenBSD: bn_lib.c,v 1.83 2023/04/19 10:54:49 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 | * |
@@ -900,6 +900,25 @@ BN_is_negative(const BIGNUM *a) | |||
900 | return a->neg != 0; | 900 | return a->neg != 0; |
901 | } | 901 | } |
902 | 902 | ||
903 | char * | ||
904 | BN_options(void) | ||
905 | { | ||
906 | static int init = 0; | ||
907 | static char data[16]; | ||
908 | |||
909 | if (!init) { | ||
910 | init++; | ||
911 | #ifdef BN_LLONG | ||
912 | snprintf(data,sizeof data, "bn(%d,%d)", | ||
913 | (int)sizeof(BN_ULLONG) * 8, (int)sizeof(BN_ULONG) * 8); | ||
914 | #else | ||
915 | snprintf(data,sizeof data, "bn(%d,%d)", | ||
916 | (int)sizeof(BN_ULONG) * 8, (int)sizeof(BN_ULONG) * 8); | ||
917 | #endif | ||
918 | } | ||
919 | return (data); | ||
920 | } | ||
921 | |||
903 | /* | 922 | /* |
904 | * Bits of security, see SP800-57, section 5.6.11, table 2. | 923 | * Bits of security, see SP800-57, section 5.6.11, table 2. |
905 | */ | 924 | */ |