{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752057689, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"c8b41697ebcc7f41fbf30ffd08f445b6", "commit": {"type":"commit", "time": 1486520187, "time_ofs": 0, "oid_tree": { "oid": "37ef9f42807bed9b4fbe7bde07f5b0d875986415", "alias": []}, "oid":{ "oid": "20fc2051d2f8ec678b62d5f5c9d799ce51368120", "alias": []}, "msg": "Use contants for Chacha/Poly, redo algorithm expressions.", "sig_commit": { "git_time": { "time": 1486520187, "offset": 0 }, "name": "Dr. Stephen Henson", "email": "steve@openssl.org", "md5": "fb4026c8240f7577a612418c24e54343" }, "sig_author": { "git_time": { "time": 1486409134, "offset": 0 }, "name": "Dr. Stephen Henson", "email": "steve@openssl.org", "md5": "fb4026c8240f7577a612418c24e54343" }}, "body": "Use contants for Chacha/Poly, redo algorithm expressions.\n\nReviewed-by: Matt Caswell \u003cmatt@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/2550)" , "diff": "diff --git a/include/openssl/evp.h b/include/openssl/evp.h\nindex 237a2b2..f34f30e 100644\n--- a/include/openssl/evp.h\n+++ b/include/openssl/evp.h\n@@ -374,6 +374,9 @@ typedef struct {\n /* Length of CCM8 tag for TLS */\n # define EVP_CCM8_TLS_TAG_LEN 8\n \n+/* Length of tag for TLS */\n+# define EVP_CHACHAPOLY_TLS_TAG_LEN 16\n+\n typedef struct evp_cipher_info_st {\n const EVP_CIPHER *cipher;\n unsigned char iv[EVP_MAX_IV_LENGTH];\ndiff --git a/ssl/record/ssl3_record_tls13.c b/ssl/record/ssl3_record_tls13.c\nindex e3765de..9dc7075 100644\n--- a/ssl/record/ssl3_record_tls13.c\n+++ b/ssl/record/ssl3_record_tls13.c\n@@ -29,6 +29,7 @@ int tls13_enc(SSL *s, SSL3_RECORD *recs, size_t n_recs, int send)\n unsigned char *seq;\n int lenu, lenf;\n SSL3_RECORD *rec \u003d \u0026recs[0];\n+ uint32_t alg_enc \u003d s-\u003es3-\u003etmp.new_cipher-\u003ealgorithm_enc;\n \n if (n_recs !\u003d 1) {\n /* Should not happen */\n@@ -53,17 +54,20 @@ int tls13_enc(SSL *s, SSL3_RECORD *recs, size_t n_recs, int send)\n }\n ivlen \u003d EVP_CIPHER_CTX_iv_length(ctx);\n \n- if (EVP_CIPHER_CTX_mode(ctx) \u003d\u003d EVP_CIPH_CCM_MODE) {\n- if (s-\u003es3-\u003etmp.new_cipher-\u003ealgorithm_enc\n- \u0026 (SSL_AES128CCM8 | SSL_AES256CCM8))\n+ if (alg_enc \u0026 SSL_AESCCM) {\n+ if (alg_enc \u0026 (SSL_AES128CCM8 | SSL_AES256CCM8))\n taglen \u003d EVP_CCM8_TLS_TAG_LEN;\n else\n taglen \u003d EVP_CCM_TLS_TAG_LEN;\n if (send \u0026\u0026 EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, taglen,\n NULL) \u003c\u003d 0)\n return -1;\n- } else {\n+ } else if (alg_enc \u0026 SSL_AESGCM) {\n taglen \u003d EVP_GCM_TLS_TAG_LEN;\n+ } else if (alg_enc \u0026 SSL_CHACHA20) {\n+ taglen \u003d EVP_CHACHAPOLY_TLS_TAG_LEN;\n+ } else {\n+ return -1;\n }\n \n if (!send) {\n","s":{"c":1752057689,"u": 29196}} ],"g": 29929,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}