Restoring authorship annotation for <olegts@yandex-team.ru>. Commit 2 of 2.

1 files changed, 137 insertions, 137 deletions

diff --git a/contrib/python/cryptography/_cffi_src/openssl/evp.py b/contrib/python/cryptography/_cffi_src/openssl/evp.py
index 011b6f1704..ab7cfeb395 100644
--- a/contrib/python/cryptography/_cffi_src/openssl/evp.py
+++ b/contrib/python/cryptography/_cffi_src/openssl/evp.py
@@ -1,118 +1,118 @@
-# This file is dual licensed under the terms of the Apache License, Version 
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository 
-# for complete details. 
- 
-from __future__ import absolute_import, division, print_function 
- 
-INCLUDES = """ 
-#include <openssl/evp.h> 
-""" 
- 
-TYPES = """ 
-typedef ... EVP_CIPHER; 
-typedef ... EVP_CIPHER_CTX; 
-typedef ... EVP_MD; 
-typedef ... EVP_MD_CTX; 
- 
-typedef ... EVP_PKEY; 
-typedef ... EVP_PKEY_CTX; 
-static const int EVP_PKEY_RSA; 
-static const int EVP_PKEY_DSA; 
-static const int EVP_PKEY_DH; 
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+from __future__ import absolute_import, division, print_function
+
+INCLUDES = """
+#include <openssl/evp.h>
+"""
+
+TYPES = """
+typedef ... EVP_CIPHER;
+typedef ... EVP_CIPHER_CTX;
+typedef ... EVP_MD;
+typedef ... EVP_MD_CTX;
+
+typedef ... EVP_PKEY;
+typedef ... EVP_PKEY_CTX;
+static const int EVP_PKEY_RSA;
+static const int EVP_PKEY_DSA;
+static const int EVP_PKEY_DH;
 static const int EVP_PKEY_DHX;
-static const int EVP_PKEY_EC; 
+static const int EVP_PKEY_EC;
 static const int EVP_PKEY_X25519;
 static const int EVP_PKEY_ED25519;
 static const int EVP_PKEY_X448;
 static const int EVP_PKEY_ED448;
 static const int EVP_PKEY_POLY1305;
-static const int EVP_MAX_MD_SIZE; 
+static const int EVP_MAX_MD_SIZE;
 static const int EVP_CTRL_AEAD_SET_IVLEN;
 static const int EVP_CTRL_AEAD_GET_TAG;
 static const int EVP_CTRL_AEAD_SET_TAG;
- 
-static const int Cryptography_HAS_SCRYPT; 
+
+static const int Cryptography_HAS_SCRYPT;
 static const int Cryptography_HAS_EVP_PKEY_DHX;
 static const int Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint;
 static const int Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY;
 static const long Cryptography_HAS_RAW_KEY;
 static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF;
-""" 
- 
-FUNCTIONS = """ 
-const EVP_CIPHER *EVP_get_cipherbyname(const char *); 
-int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *, int); 
-int EVP_CipherInit_ex(EVP_CIPHER_CTX *, const EVP_CIPHER *, ENGINE *, 
-                      const unsigned char *, const unsigned char *, int); 
-int EVP_CipherUpdate(EVP_CIPHER_CTX *, unsigned char *, int *, 
-                     const unsigned char *, int); 
-int EVP_CipherFinal_ex(EVP_CIPHER_CTX *, unsigned char *, int *); 
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); 
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void); 
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *); 
-int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *, int); 
-const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *); 
- 
-int EVP_MD_CTX_copy_ex(EVP_MD_CTX *, const EVP_MD_CTX *); 
-int EVP_DigestInit_ex(EVP_MD_CTX *, const EVP_MD *, ENGINE *); 
-int EVP_DigestUpdate(EVP_MD_CTX *, const void *, size_t); 
-int EVP_DigestFinal_ex(EVP_MD_CTX *, unsigned char *, unsigned int *); 
+"""
+
+FUNCTIONS = """
+const EVP_CIPHER *EVP_get_cipherbyname(const char *);
+int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *, int);
+int EVP_CipherInit_ex(EVP_CIPHER_CTX *, const EVP_CIPHER *, ENGINE *,
+                      const unsigned char *, const unsigned char *, int);
+int EVP_CipherUpdate(EVP_CIPHER_CTX *, unsigned char *, int *,
+                     const unsigned char *, int);
+int EVP_CipherFinal_ex(EVP_CIPHER_CTX *, unsigned char *, int *);
+int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
+EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
+void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *);
+int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *, int);
+const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *);
+
+int EVP_MD_CTX_copy_ex(EVP_MD_CTX *, const EVP_MD_CTX *);
+int EVP_DigestInit_ex(EVP_MD_CTX *, const EVP_MD *, ENGINE *);
+int EVP_DigestUpdate(EVP_MD_CTX *, const void *, size_t);
+int EVP_DigestFinal_ex(EVP_MD_CTX *, unsigned char *, unsigned int *);
 int EVP_DigestFinalXOF(EVP_MD_CTX *, unsigned char *, size_t);
-const EVP_MD *EVP_get_digestbyname(const char *); 
- 
-EVP_PKEY *EVP_PKEY_new(void); 
-void EVP_PKEY_free(EVP_PKEY *); 
-int EVP_PKEY_type(int); 
-int EVP_PKEY_size(EVP_PKEY *); 
-RSA *EVP_PKEY_get1_RSA(EVP_PKEY *); 
-DSA *EVP_PKEY_get1_DSA(EVP_PKEY *); 
-DH *EVP_PKEY_get1_DH(EVP_PKEY *); 
- 
-int EVP_PKEY_encrypt(EVP_PKEY_CTX *, unsigned char *, size_t *, 
-                     const unsigned char *, size_t); 
-int EVP_PKEY_decrypt(EVP_PKEY_CTX *, unsigned char *, size_t *, 
-                     const unsigned char *, size_t); 
- 
-int EVP_SignInit(EVP_MD_CTX *, const EVP_MD *); 
-int EVP_SignUpdate(EVP_MD_CTX *, const void *, size_t); 
-int EVP_SignFinal(EVP_MD_CTX *, unsigned char *, unsigned int *, EVP_PKEY *); 
- 
-int EVP_VerifyInit(EVP_MD_CTX *, const EVP_MD *); 
-int EVP_VerifyUpdate(EVP_MD_CTX *, const void *, size_t); 
-int EVP_VerifyFinal(EVP_MD_CTX *, const unsigned char *, unsigned int, 
-                    EVP_PKEY *); 
- 
+const EVP_MD *EVP_get_digestbyname(const char *);
+
+EVP_PKEY *EVP_PKEY_new(void);
+void EVP_PKEY_free(EVP_PKEY *);
+int EVP_PKEY_type(int);
+int EVP_PKEY_size(EVP_PKEY *);
+RSA *EVP_PKEY_get1_RSA(EVP_PKEY *);
+DSA *EVP_PKEY_get1_DSA(EVP_PKEY *);
+DH *EVP_PKEY_get1_DH(EVP_PKEY *);
+
+int EVP_PKEY_encrypt(EVP_PKEY_CTX *, unsigned char *, size_t *,
+                     const unsigned char *, size_t);
+int EVP_PKEY_decrypt(EVP_PKEY_CTX *, unsigned char *, size_t *,
+                     const unsigned char *, size_t);
+
+int EVP_SignInit(EVP_MD_CTX *, const EVP_MD *);
+int EVP_SignUpdate(EVP_MD_CTX *, const void *, size_t);
+int EVP_SignFinal(EVP_MD_CTX *, unsigned char *, unsigned int *, EVP_PKEY *);
+
+int EVP_VerifyInit(EVP_MD_CTX *, const EVP_MD *);
+int EVP_VerifyUpdate(EVP_MD_CTX *, const void *, size_t);
+int EVP_VerifyFinal(EVP_MD_CTX *, const unsigned char *, unsigned int,
+                    EVP_PKEY *);
+
 int EVP_DigestSignInit(EVP_MD_CTX *, EVP_PKEY_CTX **, const EVP_MD *,
                        ENGINE *, EVP_PKEY *);
 int EVP_DigestSignUpdate(EVP_MD_CTX *, const void *, size_t);
 int EVP_DigestSignFinal(EVP_MD_CTX *, unsigned char *, size_t *);
 int EVP_DigestVerifyInit(EVP_MD_CTX *, EVP_PKEY_CTX **, const EVP_MD *,
                          ENGINE *, EVP_PKEY *);
- 
-
- 
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *, ENGINE *); 
-EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int, ENGINE *); 
-EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *); 
-void EVP_PKEY_CTX_free(EVP_PKEY_CTX *); 
-int EVP_PKEY_sign_init(EVP_PKEY_CTX *); 
-int EVP_PKEY_sign(EVP_PKEY_CTX *, unsigned char *, size_t *, 
-                  const unsigned char *, size_t); 
-int EVP_PKEY_verify_init(EVP_PKEY_CTX *); 
-int EVP_PKEY_verify(EVP_PKEY_CTX *, const unsigned char *, size_t, 
-                    const unsigned char *, size_t); 
+
+
+
+EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *, ENGINE *);
+EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int, ENGINE *);
+EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *);
+void EVP_PKEY_CTX_free(EVP_PKEY_CTX *);
+int EVP_PKEY_sign_init(EVP_PKEY_CTX *);
+int EVP_PKEY_sign(EVP_PKEY_CTX *, unsigned char *, size_t *,
+                  const unsigned char *, size_t);
+int EVP_PKEY_verify_init(EVP_PKEY_CTX *);
+int EVP_PKEY_verify(EVP_PKEY_CTX *, const unsigned char *, size_t,
+                    const unsigned char *, size_t);
 int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *);
 int EVP_PKEY_verify_recover(EVP_PKEY_CTX *, unsigned char *,
                             size_t *, const unsigned char *, size_t);
-int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *); 
-int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *); 
- 
-int EVP_PKEY_set1_RSA(EVP_PKEY *, RSA *); 
-int EVP_PKEY_set1_DSA(EVP_PKEY *, DSA *); 
-int EVP_PKEY_set1_DH(EVP_PKEY *, DH *); 
- 
-int EVP_PKEY_cmp(const EVP_PKEY *, const EVP_PKEY *); 
- 
+int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *);
+int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *);
+
+int EVP_PKEY_set1_RSA(EVP_PKEY *, RSA *);
+int EVP_PKEY_set1_DSA(EVP_PKEY *, DSA *);
+int EVP_PKEY_set1_DH(EVP_PKEY *, DH *);
+
+int EVP_PKEY_cmp(const EVP_PKEY *, const EVP_PKEY *);
+
 int EVP_PKEY_keygen_init(EVP_PKEY_CTX *);
 int EVP_PKEY_keygen(EVP_PKEY_CTX *, EVP_PKEY **);
 int EVP_PKEY_derive_init(EVP_PKEY_CTX *);
@@ -120,14 +120,14 @@ int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *, EVP_PKEY *);
 int EVP_PKEY_derive(EVP_PKEY_CTX *, unsigned char *, size_t *);
 int EVP_PKEY_set_type(EVP_PKEY *, int);
 
-int EVP_PKEY_id(const EVP_PKEY *); 
-int Cryptography_EVP_PKEY_id(const EVP_PKEY *); 
- 
+int EVP_PKEY_id(const EVP_PKEY *);
+int Cryptography_EVP_PKEY_id(const EVP_PKEY *);
+
 EVP_MD_CTX *EVP_MD_CTX_new(void);
 void EVP_MD_CTX_free(EVP_MD_CTX *);
 /* Backwards compat aliases for pyOpenSSL */
-EVP_MD_CTX *Cryptography_EVP_MD_CTX_new(void); 
-void Cryptography_EVP_MD_CTX_free(EVP_MD_CTX *); 
+EVP_MD_CTX *Cryptography_EVP_MD_CTX_new(void);
+void Cryptography_EVP_MD_CTX_free(EVP_MD_CTX *);
 
 /* Added in 1.1.1 */
 int EVP_DigestSign(EVP_MD_CTX *, unsigned char *, size_t *,
@@ -138,26 +138,26 @@ int EVP_DigestVerify(EVP_MD_CTX *, const unsigned char *, size_t,
 size_t EVP_PKEY_get1_tls_encodedpoint(EVP_PKEY *, unsigned char **);
 int EVP_PKEY_set1_tls_encodedpoint(EVP_PKEY *, const unsigned char *,
                                    size_t);
- 
-/* EVP_PKEY * became const in 1.1.0 */ 
-int EVP_PKEY_bits(EVP_PKEY *); 
- 
-void OpenSSL_add_all_algorithms(void); 
-int EVP_PKEY_assign_RSA(EVP_PKEY *, RSA *); 
- 
-EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *); 
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *, EC_KEY *); 
- 
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *, int, int, void *); 
- 
-int PKCS5_PBKDF2_HMAC(const char *, int, const unsigned char *, int, int, 
-                      const EVP_MD *, int, unsigned char *); 
- 
-int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *, const EVP_MD *); 
- 
-int EVP_PBE_scrypt(const char *, size_t, const unsigned char *, size_t, 
-                   uint64_t, uint64_t, uint64_t, uint64_t, unsigned char *, 
-                   size_t); 
+
+/* EVP_PKEY * became const in 1.1.0 */
+int EVP_PKEY_bits(EVP_PKEY *);
+
+void OpenSSL_add_all_algorithms(void);
+int EVP_PKEY_assign_RSA(EVP_PKEY *, RSA *);
+
+EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *);
+int EVP_PKEY_set1_EC_KEY(EVP_PKEY *, EC_KEY *);
+
+int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *, int, int, void *);
+
+int PKCS5_PBKDF2_HMAC(const char *, int, const unsigned char *, int, int,
+                      const EVP_MD *, int, unsigned char *);
+
+int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *, const EVP_MD *);
+
+int EVP_PBE_scrypt(const char *, size_t, const unsigned char *, size_t,
+                   uint64_t, uint64_t, uint64_t, uint64_t, unsigned char *,
+                   size_t);
 
 EVP_PKEY *EVP_PKEY_new_raw_private_key(int, ENGINE *, const unsigned char *,
                                        size_t);
@@ -165,34 +165,34 @@ EVP_PKEY *EVP_PKEY_new_raw_public_key(int, ENGINE *, const unsigned char *,
                                       size_t);
 int EVP_PKEY_get_raw_private_key(const EVP_PKEY *, unsigned char *, size_t *);
 int EVP_PKEY_get_raw_public_key(const EVP_PKEY *, unsigned char *, size_t *);
-""" 
- 
-CUSTOMIZATIONS = """ 
+"""
+
+CUSTOMIZATIONS = """
 #ifdef EVP_PKEY_DHX
 const long Cryptography_HAS_EVP_PKEY_DHX = 1;
-#else 
+#else
 const long Cryptography_HAS_EVP_PKEY_DHX = 0;
 const long EVP_PKEY_DHX = -1;
-#endif 
- 
-int Cryptography_EVP_PKEY_id(const EVP_PKEY *key) { 
-    return EVP_PKEY_id(key); 
-} 
-EVP_MD_CTX *Cryptography_EVP_MD_CTX_new(void) { 
-    return EVP_MD_CTX_new(); 
-} 
+#endif
+
+int Cryptography_EVP_PKEY_id(const EVP_PKEY *key) {
+    return EVP_PKEY_id(key);
+}
+EVP_MD_CTX *Cryptography_EVP_MD_CTX_new(void) {
+    return EVP_MD_CTX_new();
+}
 void Cryptography_EVP_MD_CTX_free(EVP_MD_CTX *md) {
     EVP_MD_CTX_free(md);
-} 
+}
 
 #if CRYPTOGRAPHY_IS_LIBRESSL || defined(OPENSSL_NO_SCRYPT)
-static const long Cryptography_HAS_SCRYPT = 0; 
-int (*EVP_PBE_scrypt)(const char *, size_t, const unsigned char *, size_t, 
-                      uint64_t, uint64_t, uint64_t, uint64_t, unsigned char *, 
-                      size_t) = NULL; 
-#else 
-static const long Cryptography_HAS_SCRYPT = 1; 
-#endif 
+static const long Cryptography_HAS_SCRYPT = 0;
+int (*EVP_PBE_scrypt)(const char *, size_t, const unsigned char *, size_t,
+                      uint64_t, uint64_t, uint64_t, uint64_t, unsigned char *,
+                      size_t) = NULL;
+#else
+static const long Cryptography_HAS_SCRYPT = 1;
+#endif
 
 #if !CRYPTOGRAPHY_IS_LIBRESSL
 static const long Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint = 1;
@@ -269,4 +269,4 @@ static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF = 1;
 #ifndef EVP_PKEY_POLY1305
 #define EVP_PKEY_POLY1305 NID_poly1305
 #endif
-""" 
+"""