diff options
| author | jmc <> | 2022-12-26 07:18:53 +0000 |
|---|---|---|
| committer | jmc <> | 2022-12-26 07:18:53 +0000 |
| commit | 2eb7e5ff6bb69760f9dd4a43e7e3520ebb930120 (patch) | |
| tree | 26f3d93398833b7449b8a97e9fe4af9904382dbf /src/lib/libcrypto/bn | |
| parent | df59a12113ba6ec4c6faecd033d46176453f697e (diff) | |
| download | openbsd-2eb7e5ff6bb69760f9dd4a43e7e3520ebb930120.tar.gz openbsd-2eb7e5ff6bb69760f9dd4a43e7e3520ebb930120.tar.bz2 openbsd-2eb7e5ff6bb69760f9dd4a43e7e3520ebb930120.zip | |
spelling fixes; from paul tagliamonte
i removed the arithmetics -> arithmetic changes, as i felt they
were not clearly correct
ok tb
Diffstat (limited to 'src/lib/libcrypto/bn')
| -rw-r--r-- | src/lib/libcrypto/bn/asm/co-586.pl | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/mips.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/modexp512-x86_64.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/pa-risc2W.s | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/parisc-mont.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/ppc.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/ppc64-mont.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/sparcv9-mont.pl | 2 | ||||
| -rwxr-xr-x | src/lib/libcrypto/bn/asm/sparcv9a-mont.pl | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/x86-gf2m.pl | 2 | ||||
| -rwxr-xr-x | src/lib/libcrypto/bn/asm/x86-mont.pl | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/x86/comba.pl | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/asm/x86_64-gf2m.pl | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_div.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_gcd.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_x931p.c | 8 |
16 files changed, 29 insertions, 29 deletions
diff --git a/src/lib/libcrypto/bn/asm/co-586.pl b/src/lib/libcrypto/bn/asm/co-586.pl index 57101a6bd7..37d79cc0c1 100644 --- a/src/lib/libcrypto/bn/asm/co-586.pl +++ b/src/lib/libcrypto/bn/asm/co-586.pl | |||
| @@ -28,17 +28,17 @@ sub mul_add_c | |||
| 28 | 28 | ||
| 29 | &mul("edx"); | 29 | &mul("edx"); |
| 30 | &add($c0,"eax"); | 30 | &add($c0,"eax"); |
| 31 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0; # laod next a | 31 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0; # load next a |
| 32 | &mov("eax",&wparam(0)) if $pos > 0; # load r[] | 32 | &mov("eax",&wparam(0)) if $pos > 0; # load r[] |
| 33 | ### | 33 | ### |
| 34 | &adc($c1,"edx"); | 34 | &adc($c1,"edx"); |
| 35 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0; # laod next b | 35 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0; # load next b |
| 36 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1; # laod next b | 36 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1; # load next b |
| 37 | ### | 37 | ### |
| 38 | &adc($c2,0); | 38 | &adc($c2,0); |
| 39 | # is pos > 1, it means it is the last loop | 39 | # is pos > 1, it means it is the last loop |
| 40 | &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0; # save r[]; | 40 | &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0; # save r[]; |
| 41 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1; # laod next a | 41 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1; # load next a |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | sub sqr_add_c | 44 | sub sqr_add_c |
diff --git a/src/lib/libcrypto/bn/asm/mips.pl b/src/lib/libcrypto/bn/asm/mips.pl index 215c9a7483..02d43e15b0 100644 --- a/src/lib/libcrypto/bn/asm/mips.pl +++ b/src/lib/libcrypto/bn/asm/mips.pl | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | # This is drop-in MIPS III/IV ISA replacement for crypto/bn/bn_asm.c. | 15 | # This is drop-in MIPS III/IV ISA replacement for crypto/bn/bn_asm.c. |
| 16 | # | 16 | # |
| 17 | # The module is designed to work with either of the "new" MIPS ABI(5), | 17 | # The module is designed to work with either of the "new" MIPS ABI(5), |
| 18 | # namely N32 or N64, offered by IRIX 6.x. It's not ment to work under | 18 | # namely N32 or N64, offered by IRIX 6.x. It's not meant to work under |
| 19 | # IRIX 5.x not only because it doesn't support new ABIs but also | 19 | # IRIX 5.x not only because it doesn't support new ABIs but also |
| 20 | # because 5.x kernels put R4x00 CPU into 32-bit mode and all those | 20 | # because 5.x kernels put R4x00 CPU into 32-bit mode and all those |
| 21 | # 64-bit instructions (daddu, dmultu, etc.) found below gonna only | 21 | # 64-bit instructions (daddu, dmultu, etc.) found below gonna only |
diff --git a/src/lib/libcrypto/bn/asm/modexp512-x86_64.pl b/src/lib/libcrypto/bn/asm/modexp512-x86_64.pl index 4317282835..2e71a7f03d 100644 --- a/src/lib/libcrypto/bn/asm/modexp512-x86_64.pl +++ b/src/lib/libcrypto/bn/asm/modexp512-x86_64.pl | |||
| @@ -1307,7 +1307,7 @@ end_main_loop_a3b: | |||
| 1307 | movdqa %xmm3, (+$tmp16_offset+16*3)(%rsp) | 1307 | movdqa %xmm3, (+$tmp16_offset+16*3)(%rsp) |
| 1308 | call mont_reduce | 1308 | call mont_reduce |
| 1309 | 1309 | ||
| 1310 | # If result > m, subract m | 1310 | # If result > m, subtract m |
| 1311 | # load result into r15:r8 | 1311 | # load result into r15:r8 |
| 1312 | mov (+$pResult_offset)(%rsp), %rax | 1312 | mov (+$pResult_offset)(%rsp), %rax |
| 1313 | mov (+8*0)(%rax), %r8 | 1313 | mov (+8*0)(%rax), %r8 |
diff --git a/src/lib/libcrypto/bn/asm/pa-risc2W.s b/src/lib/libcrypto/bn/asm/pa-risc2W.s index a99545754d..a91f3ea5af 100644 --- a/src/lib/libcrypto/bn/asm/pa-risc2W.s +++ b/src/lib/libcrypto/bn/asm/pa-risc2W.s | |||
| @@ -783,7 +783,7 @@ $00000012 | |||
| 783 | COPY %r0,%r10 ; ret = 0 | 783 | COPY %r0,%r10 ; ret = 0 |
| 784 | MTSARCM %r31 ; i to shift | 784 | MTSARCM %r31 ; i to shift |
| 785 | DEPD,Z %r3,%sar,64,%r3 ; d <<= i; | 785 | DEPD,Z %r3,%sar,64,%r3 ; d <<= i; |
| 786 | SUBI 64,%r31,%r19 ; 64 - i; redundent | 786 | SUBI 64,%r31,%r19 ; 64 - i; redundant |
| 787 | MTSAR %r19 ; (64 -i) to shift | 787 | MTSAR %r19 ; (64 -i) to shift |
| 788 | SHRPD %r4,%r5,%sar,%r4 ; l>> (64-i) | 788 | SHRPD %r4,%r5,%sar,%r4 ; l>> (64-i) |
| 789 | MTSARCM %r31 ; i to shift | 789 | MTSARCM %r31 ; i to shift |
diff --git a/src/lib/libcrypto/bn/asm/parisc-mont.pl b/src/lib/libcrypto/bn/asm/parisc-mont.pl index fcfdee1f1f..6da9574adf 100644 --- a/src/lib/libcrypto/bn/asm/parisc-mont.pl +++ b/src/lib/libcrypto/bn/asm/parisc-mont.pl | |||
| @@ -116,7 +116,7 @@ $fp="%r3"; | |||
| 116 | $hi1="%r2"; | 116 | $hi1="%r2"; |
| 117 | $hi0="%r1"; | 117 | $hi0="%r1"; |
| 118 | 118 | ||
| 119 | $xfer=$n0; # accomodates [-16..15] offset in fld[dw]s | 119 | $xfer=$n0; # accommodates [-16..15] offset in fld[dw]s |
| 120 | 120 | ||
| 121 | $fm0="%fr4"; $fti=$fm0; | 121 | $fm0="%fr4"; $fti=$fm0; |
| 122 | $fbi="%fr5L"; | 122 | $fbi="%fr5L"; |
diff --git a/src/lib/libcrypto/bn/asm/ppc.pl b/src/lib/libcrypto/bn/asm/ppc.pl index 1249ce2299..34e38d8f6a 100644 --- a/src/lib/libcrypto/bn/asm/ppc.pl +++ b/src/lib/libcrypto/bn/asm/ppc.pl | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #dsa 512 bits 0.0087s 0.0106s 114.3 94.5 | 34 | #dsa 512 bits 0.0087s 0.0106s 114.3 94.5 |
| 35 | #dsa 1024 bits 0.0256s 0.0313s 39.0 32.0 | 35 | #dsa 1024 bits 0.0256s 0.0313s 39.0 32.0 |
| 36 | # | 36 | # |
| 37 | # Same bechmark with this assembler code: | 37 | # Same benchmark with this assembler code: |
| 38 | # | 38 | # |
| 39 | #rsa 512 bits 0.0056s 0.0005s 178.6 2049.2 | 39 | #rsa 512 bits 0.0056s 0.0005s 178.6 2049.2 |
| 40 | #rsa 1024 bits 0.0283s 0.0015s 35.3 674.1 | 40 | #rsa 1024 bits 0.0283s 0.0015s 35.3 674.1 |
diff --git a/src/lib/libcrypto/bn/asm/ppc64-mont.pl b/src/lib/libcrypto/bn/asm/ppc64-mont.pl index a14e769ad0..a9291f4bf7 100644 --- a/src/lib/libcrypto/bn/asm/ppc64-mont.pl +++ b/src/lib/libcrypto/bn/asm/ppc64-mont.pl | |||
| @@ -919,7 +919,7 @@ $code.=<<___; | |||
| 919 | std $t3,-16($tp) ; tp[j-1] | 919 | std $t3,-16($tp) ; tp[j-1] |
| 920 | std $t5,-8($tp) ; tp[j] | 920 | std $t5,-8($tp) ; tp[j] |
| 921 | 921 | ||
| 922 | add $carry,$carry,$ovf ; comsume upmost overflow | 922 | add $carry,$carry,$ovf ; consume upmost overflow |
| 923 | add $t6,$t6,$carry ; can not overflow | 923 | add $t6,$t6,$carry ; can not overflow |
| 924 | srdi $carry,$t6,16 | 924 | srdi $carry,$t6,16 |
| 925 | add $t7,$t7,$carry | 925 | add $t7,$t7,$carry |
diff --git a/src/lib/libcrypto/bn/asm/sparcv9-mont.pl b/src/lib/libcrypto/bn/asm/sparcv9-mont.pl index b8fb1e8a25..fb44c01443 100644 --- a/src/lib/libcrypto/bn/asm/sparcv9-mont.pl +++ b/src/lib/libcrypto/bn/asm/sparcv9-mont.pl | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | # for undertaken effort are multiple. First of all, UltraSPARC is not | 13 | # for undertaken effort are multiple. First of all, UltraSPARC is not |
| 14 | # the whole SPARCv9 universe and other VIS-free implementations deserve | 14 | # the whole SPARCv9 universe and other VIS-free implementations deserve |
| 15 | # optimized code as much. Secondly, newly introduced UltraSPARC T1, | 15 | # optimized code as much. Secondly, newly introduced UltraSPARC T1, |
| 16 | # a.k.a. Niagara, has shared FPU and concurrent FPU-intensive pathes, | 16 | # a.k.a. Niagara, has shared FPU and concurrent FPU-intensive paths, |
| 17 | # such as sparcv9a-mont, will simply sink it. Yes, T1 is equipped with | 17 | # such as sparcv9a-mont, will simply sink it. Yes, T1 is equipped with |
| 18 | # several integrated RSA/DSA accelerator circuits accessible through | 18 | # several integrated RSA/DSA accelerator circuits accessible through |
| 19 | # kernel driver [only(*)], but having decent user-land software | 19 | # kernel driver [only(*)], but having decent user-land software |
diff --git a/src/lib/libcrypto/bn/asm/sparcv9a-mont.pl b/src/lib/libcrypto/bn/asm/sparcv9a-mont.pl index a14205f2f0..4ebe15c5c0 100755 --- a/src/lib/libcrypto/bn/asm/sparcv9a-mont.pl +++ b/src/lib/libcrypto/bn/asm/sparcv9a-mont.pl | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | # | 51 | # |
| 52 | # Modulo-scheduled inner loops allow to interleave floating point and | 52 | # Modulo-scheduled inner loops allow to interleave floating point and |
| 53 | # integer instructions and minimize Read-After-Write penalties. This | 53 | # integer instructions and minimize Read-After-Write penalties. This |
| 54 | # results in *further* 20-50% perfromance improvement [depending on | 54 | # results in *further* 20-50% performance improvement [depending on |
| 55 | # key length, more for longer keys] on USI&II cores and 30-80% - on | 55 | # key length, more for longer keys] on USI&II cores and 30-80% - on |
| 56 | # USIII&IV. | 56 | # USIII&IV. |
| 57 | 57 | ||
| @@ -867,7 +867,7 @@ ___ | |||
| 867 | $code =~ s/\`([^\`]*)\`/eval($1)/gem; | 867 | $code =~ s/\`([^\`]*)\`/eval($1)/gem; |
| 868 | 868 | ||
| 869 | # Below substitution makes it possible to compile without demanding | 869 | # Below substitution makes it possible to compile without demanding |
| 870 | # VIS extentions on command line, e.g. -xarch=v9 vs. -xarch=v9a. I | 870 | # VIS extensions on command line, e.g. -xarch=v9 vs. -xarch=v9a. I |
| 871 | # dare to do this, because VIS capability is detected at run-time now | 871 | # dare to do this, because VIS capability is detected at run-time now |
| 872 | # and this routine is not called on CPU not capable to execute it. Do | 872 | # and this routine is not called on CPU not capable to execute it. Do |
| 873 | # note that fzeros is not the only VIS dependency! Another dependency | 873 | # note that fzeros is not the only VIS dependency! Another dependency |
diff --git a/src/lib/libcrypto/bn/asm/x86-gf2m.pl b/src/lib/libcrypto/bn/asm/x86-gf2m.pl index 97d9136260..9715b2158f 100644 --- a/src/lib/libcrypto/bn/asm/x86-gf2m.pl +++ b/src/lib/libcrypto/bn/asm/x86-gf2m.pl | |||
| @@ -142,7 +142,7 @@ $R="mm0"; | |||
| 142 | &xor ($a4,$a2); # a2=a4^a2^a4 | 142 | &xor ($a4,$a2); # a2=a4^a2^a4 |
| 143 | &mov (&DWP(5*4,"esp"),$a1); # a1^a4 | 143 | &mov (&DWP(5*4,"esp"),$a1); # a1^a4 |
| 144 | &xor ($a4,$a1); # a1^a2^a4 | 144 | &xor ($a4,$a1); # a1^a2^a4 |
| 145 | &sar (@i[1],31); # broardcast 30th bit | 145 | &sar (@i[1],31); # broadcast 30th bit |
| 146 | &and ($lo,$b); | 146 | &and ($lo,$b); |
| 147 | &mov (&DWP(6*4,"esp"),$a2); # a2^a4 | 147 | &mov (&DWP(6*4,"esp"),$a2); # a2^a4 |
| 148 | &and (@i[1],$b); | 148 | &and (@i[1],$b); |
diff --git a/src/lib/libcrypto/bn/asm/x86-mont.pl b/src/lib/libcrypto/bn/asm/x86-mont.pl index a0bdd5787e..e6c04739b1 100755 --- a/src/lib/libcrypto/bn/asm/x86-mont.pl +++ b/src/lib/libcrypto/bn/asm/x86-mont.pl | |||
| @@ -69,7 +69,7 @@ $frame=32; # size of above frame rounded up to 16n | |||
| 69 | &lea ("esp",&DWP(-$frame,"esp","edi",4)); # alloca($frame+4*(num+2)) | 69 | &lea ("esp",&DWP(-$frame,"esp","edi",4)); # alloca($frame+4*(num+2)) |
| 70 | &neg ("edi"); | 70 | &neg ("edi"); |
| 71 | 71 | ||
| 72 | # minimize cache contention by arraning 2K window between stack | 72 | # minimize cache contention by arranging 2K window between stack |
| 73 | # pointer and ap argument [np is also position sensitive vector, | 73 | # pointer and ap argument [np is also position sensitive vector, |
| 74 | # but it's assumed to be near ap, as it's allocated at ~same | 74 | # but it's assumed to be near ap, as it's allocated at ~same |
| 75 | # time]. | 75 | # time]. |
| @@ -267,7 +267,7 @@ if (0) { | |||
| 267 | &xor ("eax","eax"); # signal "not fast enough [yet]" | 267 | &xor ("eax","eax"); # signal "not fast enough [yet]" |
| 268 | &jmp (&label("just_leave")); | 268 | &jmp (&label("just_leave")); |
| 269 | # While the below code provides competitive performance for | 269 | # While the below code provides competitive performance for |
| 270 | # all key lengthes on modern Intel cores, it's still more | 270 | # all key lengths on modern Intel cores, it's still more |
| 271 | # than 10% slower for 4096-bit key elsewhere:-( "Competitive" | 271 | # than 10% slower for 4096-bit key elsewhere:-( "Competitive" |
| 272 | # means compared to the original integer-only assembler. | 272 | # means compared to the original integer-only assembler. |
| 273 | # 512-bit RSA sign is better by ~40%, but that's about all | 273 | # 512-bit RSA sign is better by ~40%, but that's about all |
diff --git a/src/lib/libcrypto/bn/asm/x86/comba.pl b/src/lib/libcrypto/bn/asm/x86/comba.pl index dc4ec97ff5..762412974a 100644 --- a/src/lib/libcrypto/bn/asm/x86/comba.pl +++ b/src/lib/libcrypto/bn/asm/x86/comba.pl | |||
| @@ -16,17 +16,17 @@ sub mul_add_c | |||
| 16 | 16 | ||
| 17 | &mul("edx"); | 17 | &mul("edx"); |
| 18 | &add($c0,"eax"); | 18 | &add($c0,"eax"); |
| 19 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0; # laod next a | 19 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0; # load next a |
| 20 | &mov("eax",&wparam(0)) if $pos > 0; # load r[] | 20 | &mov("eax",&wparam(0)) if $pos > 0; # load r[] |
| 21 | ### | 21 | ### |
| 22 | &adc($c1,"edx"); | 22 | &adc($c1,"edx"); |
| 23 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0; # laod next b | 23 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0; # load next b |
| 24 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1; # laod next b | 24 | &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1; # load next b |
| 25 | ### | 25 | ### |
| 26 | &adc($c2,0); | 26 | &adc($c2,0); |
| 27 | # is pos > 1, it means it is the last loop | 27 | # is pos > 1, it means it is the last loop |
| 28 | &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0; # save r[]; | 28 | &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0; # save r[]; |
| 29 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1; # laod next a | 29 | &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1; # load next a |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | sub sqr_add_c | 32 | sub sqr_add_c |
diff --git a/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl b/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl index 3ecb425dad..24dacb1e9c 100644 --- a/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl +++ b/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl | |||
| @@ -59,7 +59,7 @@ _mul_1x1: | |||
| 59 | sar \$63,$i0 # broadcast 62nd bit | 59 | sar \$63,$i0 # broadcast 62nd bit |
| 60 | lea (,$a1,4),$a4 | 60 | lea (,$a1,4),$a4 |
| 61 | and $b,$a | 61 | and $b,$a |
| 62 | sar \$63,$i1 # boardcast 61st bit | 62 | sar \$63,$i1 # broadcast 61st bit |
| 63 | mov $a,$hi # $a is $lo | 63 | mov $a,$hi # $a is $lo |
| 64 | shl \$63,$lo | 64 | shl \$63,$lo |
| 65 | and $b,$i0 | 65 | and $b,$i0 |
diff --git a/src/lib/libcrypto/bn/bn_div.c b/src/lib/libcrypto/bn/bn_div.c index a62e74da5d..d0adc4688f 100644 --- a/src/lib/libcrypto/bn/bn_div.c +++ b/src/lib/libcrypto/bn/bn_div.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_div.c,v 1.28 2022/11/26 16:08:51 tb Exp $ */ | 1 | /* $OpenBSD: bn_div.c,v 1.29 2022/12/26 07:18:51 jmc 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 | * |
| @@ -327,7 +327,7 @@ BN_div_internal(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor | |||
| 327 | l0 = bn_mul_words(tmp->d, sdiv->d, div_n, q); | 327 | l0 = bn_mul_words(tmp->d, sdiv->d, div_n, q); |
| 328 | tmp->d[div_n] = l0; | 328 | tmp->d[div_n] = l0; |
| 329 | wnum.d--; | 329 | wnum.d--; |
| 330 | /* ingore top values of the bignums just sub the two | 330 | /* ignore top values of the bignums just sub the two |
| 331 | * BN_ULONG arrays with bn_sub_words */ | 331 | * BN_ULONG arrays with bn_sub_words */ |
| 332 | if (bn_sub_words(wnum.d, wnum.d, tmp->d, div_n + 1)) { | 332 | if (bn_sub_words(wnum.d, wnum.d, tmp->d, div_n + 1)) { |
| 333 | /* Note: As we have considered only the leading | 333 | /* Note: As we have considered only the leading |
diff --git a/src/lib/libcrypto/bn/bn_gcd.c b/src/lib/libcrypto/bn/bn_gcd.c index f3a23701b1..0d8bdf07eb 100644 --- a/src/lib/libcrypto/bn/bn_gcd.c +++ b/src/lib/libcrypto/bn/bn_gcd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_gcd.c,v 1.19 2022/12/01 02:58:31 jsing Exp $ */ | 1 | /* $OpenBSD: bn_gcd.c,v 1.20 2022/12/26 07:18:51 jmc 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 | * |
| @@ -301,7 +301,7 @@ BN_mod_inverse_internal(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ct | |||
| 301 | /* Binary inversion algorithm; requires odd modulus. | 301 | /* Binary inversion algorithm; requires odd modulus. |
| 302 | * This is faster than the general algorithm if the modulus | 302 | * This is faster than the general algorithm if the modulus |
| 303 | * is sufficiently small (about 400 .. 500 bits on 32-bit | 303 | * is sufficiently small (about 400 .. 500 bits on 32-bit |
| 304 | * sytems, but much more on 64-bit systems) */ | 304 | * systems, but much more on 64-bit systems) */ |
| 305 | int shift; | 305 | int shift; |
| 306 | 306 | ||
| 307 | while (!BN_is_zero(B)) { | 307 | while (!BN_is_zero(B)) { |
diff --git a/src/lib/libcrypto/bn/bn_x931p.c b/src/lib/libcrypto/bn/bn_x931p.c index b14e9810dd..e73c416e3f 100644 --- a/src/lib/libcrypto/bn/bn_x931p.c +++ b/src/lib/libcrypto/bn/bn_x931p.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_x931p.c,v 1.14 2022/11/26 16:08:51 tb Exp $ */ | 1 | /* $OpenBSD: bn_x931p.c,v 1.15 2022/12/26 07:18:51 jmc Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2005. | 3 | * project 2005. |
| 4 | */ | 4 | */ |
| @@ -80,7 +80,7 @@ bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx, BN_GENCB *cb) | |||
| 80 | for (;;) { | 80 | for (;;) { |
| 81 | i++; | 81 | i++; |
| 82 | BN_GENCB_call(cb, 0, i); | 82 | BN_GENCB_call(cb, 0, i); |
| 83 | /* NB 27 MR is specificed in X9.31 */ | 83 | /* NB 27 MR is specified in X9.31 */ |
| 84 | is_prime = BN_is_prime_fasttest_ex(pi, 27, ctx, 1, cb); | 84 | is_prime = BN_is_prime_fasttest_ex(pi, 27, ctx, 1, cb); |
| 85 | if (is_prime < 0) | 85 | if (is_prime < 0) |
| 86 | return 0; | 86 | return 0; |
| @@ -205,8 +205,8 @@ err: | |||
| 205 | return ret; | 205 | return ret; |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | /* Generate pair of paramters Xp, Xq for X9.31 prime generation. | 208 | /* Generate pair of parameters Xp, Xq for X9.31 prime generation. |
| 209 | * Note: nbits paramter is sum of number of bits in both. | 209 | * Note: nbits parameter is sum of number of bits in both. |
| 210 | */ | 210 | */ |
| 211 | 211 | ||
| 212 | int | 212 | int |
