提交 dd07e68b 编写于 作者: D Dr. Matthias St. Pierre

Fix miscellaneous typos in docs and source

- d2i_PKC8PrivateKey -> d2i_PKCS8PrivateKey
- bechmark -> benchmark
- ciperhsuite -> ciphersuite
- EncyptedPreMasterSecret -> EncryptedPreMasterSecret
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5570)
上级 d597208c
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#dsa 512 bits 0.0087s 0.0106s 114.3 94.5 #dsa 512 bits 0.0087s 0.0106s 114.3 94.5
#dsa 1024 bits 0.0256s 0.0313s 39.0 32.0 #dsa 1024 bits 0.0256s 0.0313s 39.0 32.0
# #
# Same bechmark with this assembler code: # Same benchmark with this assembler code:
# #
#rsa 512 bits 0.0056s 0.0005s 178.6 2049.2 #rsa 512 bits 0.0056s 0.0005s 178.6 2049.2
#rsa 1024 bits 0.0283s 0.0015s 35.3 674.1 #rsa 1024 bits 0.0283s 0.0015s 35.3 674.1
......
...@@ -73,11 +73,11 @@ is only effective if RSA algorithm is specified to test. ...@@ -73,11 +73,11 @@ is only effective if RSA algorithm is specified to test.
=item B<-seconds num> =item B<-seconds num>
Run bechmarks for B<num> seconds. Run benchmarks for B<num> seconds.
=item B<-bytes num> =item B<-bytes num>
Run bechmarks on B<num>-byte buffers. Affects ciphers, digests and the CSPRNG. Run benchmarks on B<num>-byte buffers. Affects ciphers, digests and the CSPRNG.
=item B<[zero or more test algorithms]> =item B<[zero or more test algorithms]>
......
...@@ -44,7 +44,7 @@ These functions are similar to the d2i_X509() functions; see L<d2i_X509(3)>. ...@@ -44,7 +44,7 @@ These functions are similar to the d2i_X509() functions; see L<d2i_X509(3)>.
All these functions use DER format and unencrypted keys. Applications wishing All these functions use DER format and unencrypted keys. Applications wishing
to encrypt or decrypt private keys should use other functions such as to encrypt or decrypt private keys should use other functions such as
d2i_PKC8PrivateKey() instead. d2i_PKCS8PrivateKey() instead.
If the B<*a> is not NULL when calling d2i_PrivateKey() or d2i_AutoPrivateKey() If the B<*a> is not NULL when calling d2i_PrivateKey() or d2i_AutoPrivateKey()
(i.e. an existing structure is being reused) and the key format is PKCS#8 (i.e. an existing structure is being reused) and the key format is PKCS#8
......
...@@ -1086,10 +1086,10 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL *ssl, ...@@ -1086,10 +1086,10 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL *ssl,
case SSL_kRSAPSK: case SSL_kRSAPSK:
if (TLS1_get_version(ssl) == SSL3_VERSION) { if (TLS1_get_version(ssl) == SSL3_VERSION) {
ssl_print_hex(bio, indent + 2, ssl_print_hex(bio, indent + 2,
"EncyptedPreMasterSecret", msg, msglen); "EncryptedPreMasterSecret", msg, msglen);
} else { } else {
if (!ssl_print_hexbuf(bio, indent + 2, if (!ssl_print_hexbuf(bio, indent + 2,
"EncyptedPreMasterSecret", 2, &msg, &msglen)) "EncryptedPreMasterSecret", 2, &msg, &msglen))
return 0; return 0;
} }
break; break;
......
...@@ -63,7 +63,7 @@ $proxy->start(); ...@@ -63,7 +63,7 @@ $proxy->start();
ok(TLSProxy::Message->fail(), "PSK not last"); ok(TLSProxy::Message->fail(), "PSK not last");
#Test 3: Attempt a resume after an HRR where PSK hash matches selected #Test 3: Attempt a resume after an HRR where PSK hash matches selected
# ciperhsuite. Should see PSK on second ClientHello # ciphersuite. Should see PSK on second ClientHello
$proxy->clear(); $proxy->clear();
$proxy->clientflags("-sess_in ".$session); $proxy->clientflags("-sess_in ".$session);
$proxy->serverflags("-curves P-256"); $proxy->serverflags("-curves P-256");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册