deploy openssl/openssl@d20cbc9 to master

Author: openssl-machine

master/man3/SSL_CIPHER_get_name/index.html

@@ -25,7 +25,7 @@
 int SSL_CIPHER_is_aead(const SSL_CIPHER *c);
 const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
 uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c);
-uint32_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c);
+uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c);
 </code></pre></div><h2 id=description>DESCRIPTION<a class=headerlink href=#description title="Permanent link">&para;</a></h2><p>SSL_CIPHER_get_name() returns a pointer to the name of <strong>cipher</strong>. If the <strong>cipher</strong> is NULL, it returns &quot;(NONE)&quot;.</p><p>SSL_CIPHER_standard_name() returns a pointer to the standard RFC name of <strong>cipher</strong>. If the <strong>cipher</strong> is NULL, it returns &quot;(NONE)&quot;. If the <strong>cipher</strong> has no standard name, it returns <strong>NULL</strong>. If <strong>cipher</strong> was defined in both SSLv3 and TLS, it returns the TLS name.</p><p>OPENSSL_cipher_name() returns a pointer to the OpenSSL name of <strong>stdname</strong>. If the <strong>stdname</strong> is NULL, or <strong>stdname</strong> has no corresponding OpenSSL name, it returns &quot;(NONE)&quot;. Where both exist, <strong>stdname</strong> should be the TLS name rather than the SSLv3 name.</p><p>SSL_CIPHER_get_bits() returns the number of secret bits used for <strong>cipher</strong>. If <strong>cipher</strong> is NULL, 0 is returned.</p><p>SSL_CIPHER_get_version() returns string which indicates the SSL/TLS protocol version that first defined the cipher. It returns &quot;(NONE)&quot; if <strong>cipher</strong> is NULL.</p><p>SSL_CIPHER_get_cipher_nid() returns the cipher NID corresponding to <strong>c</strong>. If there is no cipher (e.g. for cipher suites with no encryption) then <strong>NID_undef</strong> is returned.</p><p>SSL_CIPHER_get_digest_nid() returns the digest NID corresponding to the MAC used by <strong>c</strong> during record encryption/decryption. If there is no digest (e.g. for AEAD cipher suites) then <strong>NID_undef</strong> is returned.</p><p>SSL_CIPHER_get_handshake_digest() returns an EVP_MD for the digest used during the SSL/TLS handshake when using the SSL_CIPHER <strong>c</strong>. Note that this may be different to the digest used to calculate the MAC for encrypted records.</p><p>SSL_CIPHER_get_kx_nid() returns the key exchange NID corresponding to the method used by <strong>c</strong>. If there is no key exchange, then <strong>NID_undef</strong> is returned. If any appropriate key exchange algorithm can be used (as in the case of TLS 1.3 cipher suites) <strong>NID_kx_any</strong> is returned. Examples (not comprehensive):</p><div class=highlight><pre><span></span><code>NID_kx_rsa
 NID_kx_ecdhe
 NID_kx_dhe