summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorschwarze <>2018-12-21 21:36:21 +0000
committerschwarze <>2018-12-21 21:36:21 +0000
commit3d49342897eea4877b76d8bfeff64559d761b46c (patch)
tree26fff136a77e26d7f1655ca4a8b6200f66c64dc4 /src
parent2cae48d8fb743d8d283be3f6eb1e4e280eb999a4 (diff)
downloadopenbsd-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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/man/DES_set_key.327
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
559implements outer triple CBC DES encryption with three keys. 559implements outer triple CBC DES encryption with three keys.
560This means that each DES operation inside the CBC mode is really an 560This 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))) .
562This mode is used by SSL. 562This mode is used by SSL.
563.Pp 563.Pp
@@ -570,13 +570,13 @@ for the final encryption.
570This form of Triple-DES is used by the RSAREF library. 570This form of Triple-DES is used by the RSAREF library.
571.Pp 571.Pp
572.Fn DES_pcbc_encrypt 572.Fn DES_pcbc_encrypt
573encrypt/decrypts using the propagating cipher block chaining mode used 573encrypts/decrypts using the propagating cipher block chaining mode used
574by Kerberos v4. 574by Kerberos v4.
575Its parameters are the same as 575Its 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
579encrypt/decrypts using cipher feedback mode. 579encrypts/decrypts using cipher feedback mode.
580This method takes an array of characters as input and outputs an array 580This method takes an array of characters as input and outputs an array
581of characters. 581of characters.
582It does not require any padding to 8 character groups. 582It 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
586next call to this function. 586next call to this function.
587Since this function runs a complete DES ECB encryption per 587Since this function runs a complete DES ECB encryption per
588.Fa numbits , 588.Fa numbits ,
589this function is only suggested for use when sending small numbers of 589this function is only suggested for use when sending a small number of
590characters. 590characters.
591.Pp 591.Pp
592.Fn DES_cfb64_encrypt 592.Fn DES_cfb64_encrypt
593implements CFB mode of DES with 64bit feedback. 593implements CFB mode of DES with 64-bit feedback.
594Why is this useful you ask? 594Why is this useful you ask?
595Because this routine will allow you to encrypt an arbitrary number of 595Because this routine will allow you to encrypt an arbitrary number of
596bytes, no 8 byte padding. 596bytes, without 8 byte padding.
597Each call to this routine will encrypt the input bytes to output and 597Each call to this routine will encrypt the input bytes to output and
598then update ivec and num. 598then update ivec and num.
599num contains "how far" we are though ivec. 599num contains "how far" we are though ivec.
600If this does not make much sense, read more about cfb mode of DES :-). 600If 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
603and 603and
@@ -615,9 +615,10 @@ Note: the
615.Fa ivec 615.Fa ivec
616variable is changed and the new changed value needs to be passed to the 616variable is changed and the new changed value needs to be passed to the
617next call to this function. 617next call to this function.
618Since this function runs a complete DES ECB encryption per numbits, this 618Since this function runs a complete DES ECB encryption per
619function is only suggested for use when sending small numbers of 619.Fa numbits ,
620characters. 620this function is only suggested for use when sending a small number
621of characters.
621.Pp 622.Pp
622.Fn DES_ofb64_encrypt 623.Fn DES_ofb64_encrypt
623is the same as 624is the same as