diff options
author | schwarze <> | 2018-12-21 21:36:21 +0000 |
---|---|---|
committer | schwarze <> | 2018-12-21 21:36:21 +0000 |
commit | 3d49342897eea4877b76d8bfeff64559d761b46c (patch) | |
tree | 26fff136a77e26d7f1655ca4a8b6200f66c64dc4 | |
parent | 2cae48d8fb743d8d283be3f6eb1e4e280eb999a4 (diff) | |
download | openbsd-3d49342897eea4877b76d8bfeff64559d761b46c.tar.gz openbsd-3d49342897eea4877b76d8bfeff64559d761b46c.tar.bz2 openbsd-3d49342897eea4877b76d8bfeff64559d761b46c.zip |
grammar and style fixes from wesinator at github
via OpenSSL commit 521738e9 Oct 5 14:58:30 2018 -0400
-rw-r--r-- | src/lib/libcrypto/man/DES_set_key.3 | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/lib/libcrypto/man/DES_set_key.3 b/src/lib/libcrypto/man/DES_set_key.3 index c95dc5de27..700b39a971 100644 --- a/src/lib/libcrypto/man/DES_set_key.3 +++ b/src/lib/libcrypto/man/DES_set_key.3 | |||
@@ -1,6 +1,6 @@ | |||
1 | .\" $OpenBSD: DES_set_key.3,v 1.12 2018/03/27 17:35:50 schwarze Exp $ | 1 | .\" $OpenBSD: DES_set_key.3,v 1.13 2018/12/21 21:36:21 schwarze Exp $ |
2 | .\" full merge up to: | 2 | .\" full merge up to: |
3 | .\" OpenSSL man3/DES_random_key 61f805c1 Jan 16 01:01:46 2018 +0800 | 3 | .\" OpenSSL man3/DES_random_key 521738e9 Oct 5 14:58:30 2018 -0400 |
4 | .\" | 4 | .\" |
5 | .\" -------------------------------------------------------------------------- | 5 | .\" -------------------------------------------------------------------------- |
6 | .\" Major patches to this file were contributed by | 6 | .\" Major patches to this file were contributed by |
@@ -115,7 +115,7 @@ | |||
115 | .\" copied and put under another distribution licence | 115 | .\" copied and put under another distribution licence |
116 | .\" [including the GNU Public Licence.] | 116 | .\" [including the GNU Public Licence.] |
117 | .\" | 117 | .\" |
118 | .Dd $Mdocdate: March 27 2018 $ | 118 | .Dd $Mdocdate: December 21 2018 $ |
119 | .Dt DES_SET_KEY 3 | 119 | .Dt DES_SET_KEY 3 |
120 | .Os | 120 | .Os |
121 | .Sh NAME | 121 | .Sh NAME |
@@ -557,7 +557,7 @@ This is much better than CBC DES. | |||
557 | .Pp | 557 | .Pp |
558 | .Fn DES_ede3_cbc_encrypt | 558 | .Fn DES_ede3_cbc_encrypt |
559 | implements outer triple CBC DES encryption with three keys. | 559 | implements outer triple CBC DES encryption with three keys. |
560 | This means that each DES operation inside the CBC mode is really an | 560 | This means that each DES operation inside the CBC mode is |
561 | .Qq Li C=E(ks3,D(ks2,E(ks1,M))) . | 561 | .Qq Li C=E(ks3,D(ks2,E(ks1,M))) . |
562 | This mode is used by SSL. | 562 | This mode is used by SSL. |
563 | .Pp | 563 | .Pp |
@@ -570,13 +570,13 @@ for the final encryption. | |||
570 | This form of Triple-DES is used by the RSAREF library. | 570 | This form of Triple-DES is used by the RSAREF library. |
571 | .Pp | 571 | .Pp |
572 | .Fn DES_pcbc_encrypt | 572 | .Fn DES_pcbc_encrypt |
573 | encrypt/decrypts using the propagating cipher block chaining mode used | 573 | encrypts/decrypts using the propagating cipher block chaining mode used |
574 | by Kerberos v4. | 574 | by Kerberos v4. |
575 | Its parameters are the same as | 575 | Its parameters are the same as |
576 | .Fn DES_ncbc_encrypt . | 576 | .Fn DES_ncbc_encrypt . |
577 | .Pp | 577 | .Pp |
578 | .Fn DES_cfb_encrypt | 578 | .Fn DES_cfb_encrypt |
579 | encrypt/decrypts using cipher feedback mode. | 579 | encrypts/decrypts using cipher feedback mode. |
580 | This method takes an array of characters as input and outputs an array | 580 | This method takes an array of characters as input and outputs an array |
581 | of characters. | 581 | of characters. |
582 | It does not require any padding to 8 character groups. | 582 | It does not require any padding to 8 character groups. |
@@ -586,18 +586,18 @@ variable is changed and the new changed value needs to be passed to the | |||
586 | next call to this function. | 586 | next call to this function. |
587 | Since this function runs a complete DES ECB encryption per | 587 | Since this function runs a complete DES ECB encryption per |
588 | .Fa numbits , | 588 | .Fa numbits , |
589 | this function is only suggested for use when sending small numbers of | 589 | this function is only suggested for use when sending a small number of |
590 | characters. | 590 | characters. |
591 | .Pp | 591 | .Pp |
592 | .Fn DES_cfb64_encrypt | 592 | .Fn DES_cfb64_encrypt |
593 | implements CFB mode of DES with 64bit feedback. | 593 | implements CFB mode of DES with 64-bit feedback. |
594 | Why is this useful you ask? | 594 | Why is this useful you ask? |
595 | Because this routine will allow you to encrypt an arbitrary number of | 595 | Because this routine will allow you to encrypt an arbitrary number of |
596 | bytes, no 8 byte padding. | 596 | bytes, without 8 byte padding. |
597 | Each call to this routine will encrypt the input bytes to output and | 597 | Each call to this routine will encrypt the input bytes to output and |
598 | then update ivec and num. | 598 | then update ivec and num. |
599 | num contains "how far" we are though ivec. | 599 | num contains "how far" we are though ivec. |
600 | If this does not make much sense, read more about cfb mode of DES :-). | 600 | If this does not make much sense, read more about CFB mode of DES. |
601 | .Pp | 601 | .Pp |
602 | .Fn DES_ede3_cfb64_encrypt | 602 | .Fn DES_ede3_cfb64_encrypt |
603 | and | 603 | and |
@@ -615,9 +615,10 @@ Note: the | |||
615 | .Fa ivec | 615 | .Fa ivec |
616 | variable is changed and the new changed value needs to be passed to the | 616 | variable is changed and the new changed value needs to be passed to the |
617 | next call to this function. | 617 | next call to this function. |
618 | Since this function runs a complete DES ECB encryption per numbits, this | 618 | Since this function runs a complete DES ECB encryption per |
619 | function is only suggested for use when sending small numbers of | 619 | .Fa numbits , |
620 | characters. | 620 | this function is only suggested for use when sending a small number |
621 | of characters. | ||
621 | .Pp | 622 | .Pp |
622 | .Fn DES_ofb64_encrypt | 623 | .Fn DES_ofb64_encrypt |
623 | is the same as | 624 | is the same as |