Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 5

cyrus-imapd.spec Changed

0001-Fixed-CALDAV-PUT-requests-while-proxying.patch Changed

@@ -1,4 +1,4 @@
-From 44855ed9ae645725f03ae87ace647b066e0e74fb Mon Sep 17 00:00:00 2001
+From 66c4d19345a1e9374967718cb831fb8cd1826e7e Mon Sep 17 00:00:00 2001
 From: Christian Mollekopf <mollekopf@apheleia-it.ch>
 Date: Tue, 4 Oct 2022 13:48:02 +0200
 Subject: PATCH 1/4 Fixed CALDAV PUT requests while proxying
@@ -9,15 +9,15 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/imap/http_dav.c b/imap/http_dav.c
-index abc6da42c..7c13d783b 100644
+index c5c94f8dd..bd73964f2 100644
 --- a/imap/http_dav.c
 +++ b/imap/http_dav.c
-@@ -7097,7 +7097,7 @@ int meth_put(struct transaction_t *txn, void *params)
+@@ -7102,7 +7102,7 @@ int meth_put(struct transaction_t *txn, void *params)
      }
  
      /* Make sure mailbox type is correct */
--    if (txn->req_tgt.mbentry->mbtype != txn->req_tgt.namespace->mboxtype)
-+    if (txn->req_tgt.mbentry->mbtype != txn->req_tgt.namespace->mboxtype && txn->req_tgt.mbentry->mbtype != MBTYPE_REMOTE)
+-    if (mbtype_isa(txn->req_tgt.mbentry->mbtype) != txn->req_tgt.namespace->mboxtype)
++    if ((mbtype_isa(txn->req_tgt.mbentry->mbtype) != txn->req_tgt.namespace->mboxtype) && txn->req_tgt.mbentry->mbtype != MBTYPE_REMOTE)
          return HTTP_FORBIDDEN;
  
      /* Make sure Content-Range isn't specified */

0001-Openssl-3.0-fixes.patch Deleted

@@ -1,175 +0,0 @@
-From 2c816fac8d7f69539b0dde34fa74a55257232d16 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Fri, 14 Oct 2022 17:00:07 +0200
-Subject: PATCH Openssl 3.0 fixes
-
----
- imap/tls.c      | 31 +++++++++++++++++++------------
- imtest/imtest.c | 12 +++++++-----
- 2 files changed, 26 insertions(+), 17 deletions(-)
-
-diff --git a/imap/tls.c b/imap/tls.c
-index 7951c98e3..df6c9cd61 100644
---- a/imap/tls.c
-+++ b/imap/tls.c
-@@ -149,7 +149,7 @@ static int tls_serverengine = 0; /* server engine initialized? */
- static int tls_clientengine = 0; /* client engine initialized? */
- static int do_dump = 0;         /* actively dumping protocol? */
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
- static DH *dh_params = NULL;
- #endif
- 
-@@ -240,7 +240,7 @@ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
- }
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
- /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
-  * DH params to work with DHE-* cipher suites. Hardcoded fallback
-  * in case no DH params in server_key or server_cert.
-@@ -739,7 +739,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
-     const char   *client_ca_file;
-     const char   *server_ca_file;
-     const char   *server_cert_file;
--    const char   *server_dhparam_file;
-     const char   *server_key_file;
-     const char   *crl_file_path;
-     enum enum_value tls_client_certs;
-@@ -883,7 +882,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
- 
-     server_ca_file = config_getstring(IMAPOPT_TLS_SERVER_CA_FILE);
-     server_cert_file = config_getstring(IMAPOPT_TLS_SERVER_CERT);
--    server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
-     server_key_file = config_getstring(IMAPOPT_TLS_SERVER_KEY);
- 
-     if (config_debug) {
-@@ -949,8 +947,11 @@ EXPORTED int     tls_init_serverengine(const char *ident,
-     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+    SSL_CTX_set_dh_auto(s_ctx, 1);
-+#elif (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-     /* Load DH params for DHE-* key exchanges */
-+    const char *server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
-     dh_params = load_dh_param(server_dhparam_file, server_key_file, server_cert_file);
-     SSL_CTX_set_tmp_dh(s_ctx, dh_params);
- #endif
-@@ -959,12 +960,16 @@ EXPORTED int     tls_init_serverengine(const char *ident,
-     const char *ec = config_getstring(IMAPOPT_TLS_ECCURVE);
-     int openssl_nid = OBJ_sn2nid(ec);
-     if (openssl_nid != 0) {
-+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
-+        SSL_CTX_set1_curves(s_ctx, &openssl_nid, 1);
-+#else
-         EC_KEY *ecdh;
-         ecdh = EC_KEY_new_by_curve_name(openssl_nid);
-         if (ecdh != NULL) {
-             SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
-             EC_KEY_free(ecdh);
-         }
-+#endif
-     }
- #endif
- 
-@@ -1086,20 +1091,22 @@ EXPORTED int     tls_init_serverengine(const char *ident,
- 
- /* taken from OpenSSL apps/s_cb.c */
- 
--static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
--                        long argl __attribute__((unused)), long ret)
-+static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
-+                        size_t len __attribute__((unused)), int argi,
-+                        long argl __attribute__((unused)), int ret,
-+                        size_t *processed __attribute__((unused)))
- {
-     if (!do_dump)
-         return (ret);
- 
-     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
--        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))",
-+        printf("read from %08lX %08lX (%d bytes => %d (0x%X))",
-                (unsigned long)bio, (unsigned long)argp,
-                argi, ret, ret);
-         tls_dump(argp, (int) ret);
-         return (ret);
-     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
--        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))",
-+        printf("write to %08lX %08lX (%d bytes => %d (0x%X))",
-                (unsigned long) bio, (unsigned long)argp,
-                argi, ret, ret);
-         tls_dump(argp, (int) ret);
-@@ -1171,7 +1178,7 @@ EXPORTED int tls_start_servertls(int readfd, int writefd, int timeout,
-      * created for us, so we can use it for debugging purposes.
-      */
-     if (var_imapd_tls_loglevel >= 3)
--        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
-+        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
- 
-     /* Dump the negotiation for loglevels 3 and 4*/
-     if (var_imapd_tls_loglevel >= 3)
-@@ -1402,7 +1409,7 @@ EXPORTED int tls_shutdown_serverengine(void)
-             sess_dbopen = 0;
-         }
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
-+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
-         if (dh_params) DH_free(dh_params);
- #endif
-     }
-@@ -1659,7 +1666,7 @@ HIDDEN int tls_start_clienttls(int readfd, int writefd,
-      * created for us, so we can use it for debugging purposes.
-      */
-     if (var_proxy_tls_loglevel >= 3)
--        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
-+        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
- 
-     /* Dump the negotiation for loglevels 3 and 4*/
-     if (var_proxy_tls_loglevel >= 3)
-diff --git a/imtest/imtest.c b/imtest/imtest.c
-index a6fcf91e6..ca241fa61 100644
---- a/imtest/imtest.c
-+++ b/imtest/imtest.c
-@@ -630,20 +630,22 @@ static int tls_dump(const char *s, int len)
- 
- /* taken from OpenSSL apps/s_cb.c */
- 
--static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
--                        long argl __attribute__((unused)), long ret)
-+static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
-+                        size_t len __attribute__((unused)), int argi,
-+                        long argl __attribute__((unused)), int ret,
-+                        size_t *processed __attribute__((unused)))
- {
-     if (!do_dump)
-         return (ret);
- 
-     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
--        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))\n",
-+        printf("read from %08lX %08lX (%d bytes => %d (0x%X))\n",
-                (unsigned long) bio, (unsigned long) argp,
-                argi, ret, ret);
-         tls_dump(argp, (int) ret);
-         return (ret);
-     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
--        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))\n",
-+        printf("write to %08lX %08lX (%d bytes => %d (0x%X))\n",
-                (unsigned long) bio, (unsigned long) argp,
-                argi, ret, ret);
-         tls_dump(argp, (int) ret);
-@@ -686,7 +688,7 @@ static int tls_start_clienttls(unsigned *layer, char **authid)
-      * created for us, so we can use it for debugging purposes.
-      */
-     if (verbose==1)
--        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
-+        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
- 
-     /* Dump the negotiation for loglevels 3 and 4 */
-     if (verbose==1)
--- 
-2.37.3
-

0002-Openssl-3.0-fixes.patch Added

@@ -0,0 +1,175 @@
+From 5e22772d2c1972e6e97ee2486951d3048f36a360 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Fri, 14 Oct 2022 17:00:07 +0200
+Subject: PATCH 2/4 Openssl 3.0 fixes
+
+---
+ imap/tls.c      | 31 +++++++++++++++++++------------
+ imtest/imtest.c | 12 +++++++-----
+ 2 files changed, 26 insertions(+), 17 deletions(-)
+
+diff --git a/imap/tls.c b/imap/tls.c
+index a4b04dfb1..6a028b890 100644
+--- a/imap/tls.c
++++ b/imap/tls.c
+@@ -149,7 +149,7 @@ static int tls_serverengine = 0; /* server engine initialized? */
+ static int tls_clientengine = 0; /* client engine initialized? */
+ static int do_dump = 0;         /* actively dumping protocol? */
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+ static DH *dh_params = NULL;
+ #endif
+ 
+@@ -240,7 +240,7 @@ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+ }
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+ /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
+  * DH params to work with DHE-* cipher suites. Hardcoded fallback
+  * in case no DH params in server_key or server_cert.
+@@ -739,7 +739,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     const char   *client_ca_file;
+     const char   *server_ca_file;
+     const char   *server_cert_file;
+-    const char   *server_dhparam_file;
+     const char   *server_key_file;
+     const char   *crl_file_path;
+     enum enum_value tls_client_certs;
+@@ -883,7 +882,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+ 
+     server_ca_file = config_getstring(IMAPOPT_TLS_SERVER_CA_FILE);
+     server_cert_file = config_getstring(IMAPOPT_TLS_SERVER_CERT);
+-    server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
+     server_key_file = config_getstring(IMAPOPT_TLS_SERVER_KEY);
+ 
+     if (config_debug) {
+@@ -949,8 +947,11 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
++    SSL_CTX_set_dh_auto(s_ctx, 1);
++#elif (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
+     /* Load DH params for DHE-* key exchanges */
++    const char *server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
+     dh_params = load_dh_param(server_dhparam_file, server_key_file, server_cert_file);
+     SSL_CTX_set_tmp_dh(s_ctx, dh_params);
+ #endif
+@@ -959,12 +960,16 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     const char *ec = config_getstring(IMAPOPT_TLS_ECCURVE);
+     int openssl_nid = OBJ_sn2nid(ec);
+     if (openssl_nid != 0) {
++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
++        SSL_CTX_set1_curves(s_ctx, &openssl_nid, 1);
++#else
+         EC_KEY *ecdh;
+         ecdh = EC_KEY_new_by_curve_name(openssl_nid);
+         if (ecdh != NULL) {
+             SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
+             EC_KEY_free(ecdh);
+         }
++#endif
+     }
+ #endif
+ 
+@@ -1086,20 +1091,22 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+ 
+ /* taken from OpenSSL apps/s_cb.c */
+ 
+-static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
+-                        long argl __attribute__((unused)), long ret)
++static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
++                        size_t len __attribute__((unused)), int argi,
++                        long argl __attribute__((unused)), int ret,
++                        size_t *processed __attribute__((unused)))
+ {
+     if (!do_dump)
+         return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))",
++        printf("read from %08lX %08lX (%d bytes => %d (0x%X))",
+                (unsigned long)bio, (unsigned long)argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+         return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))",
++        printf("write to %08lX %08lX (%d bytes => %d (0x%X))",
+                (unsigned long) bio, (unsigned long)argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+@@ -1171,7 +1178,7 @@ EXPORTED int tls_start_servertls(int readfd, int writefd, int timeout,
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (var_imapd_tls_loglevel >= 3)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4*/
+     if (var_imapd_tls_loglevel >= 3)
+@@ -1402,7 +1409,7 @@ EXPORTED int tls_shutdown_serverengine(void)
+             sess_dbopen = 0;
+         }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+         if (dh_params) DH_free(dh_params);
+ #endif
+     }
+@@ -1659,7 +1666,7 @@ HIDDEN int tls_start_clienttls(int readfd, int writefd,
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (var_proxy_tls_loglevel >= 3)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4*/
+     if (var_proxy_tls_loglevel >= 3)
+diff --git a/imtest/imtest.c b/imtest/imtest.c
+index 128fb5a5e..57eafe5c1 100644
+--- a/imtest/imtest.c
++++ b/imtest/imtest.c
+@@ -630,20 +630,22 @@ static int tls_dump(const char *s, int len)
+ 
+ /* taken from OpenSSL apps/s_cb.c */
+ 
+-static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
+-                        long argl __attribute__((unused)), long ret)
++static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
++                        size_t len __attribute__((unused)), int argi,
++                        long argl __attribute__((unused)), int ret,
++                        size_t *processed __attribute__((unused)))
+ {
+     if (!do_dump)
+         return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))\n",
++        printf("read from %08lX %08lX (%d bytes => %d (0x%X))\n",
+                (unsigned long) bio, (unsigned long) argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+         return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))\n",
++        printf("write to %08lX %08lX (%d bytes => %d (0x%X))\n",
+                (unsigned long) bio, (unsigned long) argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+@@ -686,7 +688,7 @@ static int tls_start_clienttls(unsigned *layer, char **authid)
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (verbose==1)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4 */
+     if (verbose==1)
+-- 
+2.37.3
+

0003-Configurable-default-addressbook-display-name.patch Changed

@@ -1,4 +1,4 @@
-From d894680d087a684196f1af914fc399ca9fb06181 Mon Sep 17 00:00:00 2001
+From 9481178e24b09637ac8df3ceb3db462a9dfabdf5 Mon Sep 17 00:00:00 2001
 From: Christian Mollekopf <mollekopf@apheleia-it.ch>
 Date: Fri, 21 Oct 2022 12:15:20 +0200
 Subject: PATCH 3/4 Configurable default addressbook display name
@@ -9,10 +9,10 @@
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/imap/http_carddav.c b/imap/http_carddav.c
-index 0b7e6c7a5..1c9840047 100644
+index ce2aa2370..a1fdf3718 100644
 --- a/imap/http_carddav.c
 +++ b/imap/http_carddav.c
-@@ -485,7 +485,8 @@ EXPORTED int carddav_create_defaultaddressbook(const char *userid) {
+@@ -502,7 +502,8 @@ EXPORTED int carddav_create_defaultaddressbook(const char *userid) {
      r = mboxlist_lookup(mbname_intname(mbname), NULL, NULL);
      if (r == IMAP_MAILBOX_NONEXISTENT) {
          r = _create_mailbox(userid, mbname_intname(mbname),
@@ -23,10 +23,10 @@
      }
  
 diff --git a/lib/imapoptions b/lib/imapoptions
-index 5cb8ef7b8..801401dc7 100644
+index 3d43d1c36..c15163265 100644
 --- a/lib/imapoptions
 +++ b/lib/imapoptions
-@@ -109,6 +109,9 @@ are listed with ``<none>''.
+@@ -113,6 +113,9 @@ are listed with ``<none>''.
     hierarchy will be at the toplevel of the shared namespace.  A
     user's personal addressbook hierarchy will be a child of their Inbox. */

0004-Autocreate-on-PROPFIND.patch Changed

@@ -1,4 +1,4 @@
-From 589ff4d046586ea313dea026ca58de52ec504755 Mon Sep 17 00:00:00 2001
+From 26d7c35f3c674901c0691ea2ab388cbc818d9e9b Mon Sep 17 00:00:00 2001
 From: Christian Mollekopf <mollekopf@apheleia-it.ch>
 Date: Mon, 24 Oct 2022 21:37:34 +0200
 Subject: PATCH 4/4 Autocreate on PROPFIND
@@ -13,10 +13,10 @@
  1 file changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/imap/http_dav.c b/imap/http_dav.c
-index 7c13d783b..2aac8d5bb 100644
+index bd73964f2..285d4b939 100644
 --- a/imap/http_dav.c
 +++ b/imap/http_dav.c
-@@ -484,6 +484,28 @@ static unsigned long principal_allow_cb(struct request_target_t *tgt)
+@@ -509,6 +509,28 @@ static unsigned long principal_allow_cb(struct request_target_t *tgt)
      return tgt->namespace->allow;
  }
  
@@ -45,7 +45,7 @@
  
  /* Parse request-target path in DAV principals namespace */
  static int principal_parse_path(const char *path, struct request_target_t *tgt,
-@@ -6116,7 +6138,18 @@ EXPORTED int meth_propfind(struct transaction_t *txn, void *params)
+@@ -6121,7 +6143,18 @@ EXPORTED int meth_propfind(struct transaction_t *txn, void *params)
      /* Parse the path */
      if (fparams->parse_path) {
          r = dav_parse_req_target(txn, fparams);

ssl.patch Added

@@ -0,0 +1,577 @@
+diff --git a/backup/lcb_append.c b/backup/lcb_append.c
+index e62c790eea..e22bf6dc95 100644
+--- a/backup/lcb_append.c
++++ b/backup/lcb_append.c
+@@ -111,7 +111,7 @@ HIDDEN int backup_real_append_start(struct backup *backup,
+     if (index_only) backup->append_state->mode |= BACKUP_APPEND_INDEXONLY;
+ 
+     backup->append_state->wrote = 0;
+-    SHA1_Init(&backup->append_state->sha_ctx);
++    SHA1Init(&backup->append_state->sha_ctx);
+ 
+     char header80;
+     snprintf(header, sizeof(header), "# cyrus backup: chunk start\r\n");
+@@ -134,7 +134,7 @@ HIDDEN int backup_real_append_start(struct backup *backup,
+         if (r) goto error;
+     }
+ 
+-    SHA1_Update(&backup->append_state->sha_ctx, header, strlen(header));
++    SHA1Update(&backup->append_state->sha_ctx, header, strlen(header));
+     backup->append_state->wrote += strlen(header);
+ 
+     struct sqldb_bindval bval = {
+@@ -200,7 +200,7 @@ EXPORTED int backup_append(struct backup *backup,
+     iter = dlist_print_iter_new(dlist, 1);
+     do {
+         /* track the sha1sum */
+-        SHA1_Update(&backup->append_state->sha_ctx, buf_cstring(&buf), buf_len(&buf));
++        SHA1Update(&backup->append_state->sha_ctx, buf_cstring(&buf), buf_len(&buf));
+ 
+         /* if we're not in index-only mode, write the data out */
+         if (!index_only) {
+@@ -218,7 +218,7 @@ EXPORTED int backup_append(struct backup *backup,
+ 
+     /* finally, end with "\r\n" */
+     buf_setcstr(&buf, "\r\n");
+-    SHA1_Update(&backup->append_state->sha_ctx, buf_cstring(&buf), buf_len(&buf));
++    SHA1Update(&backup->append_state->sha_ctx, buf_cstring(&buf), buf_len(&buf));
+     if (!index_only) {
+         r = retry_gzwrite(backup->append_state->gzfile,
+                           buf_cstring(&buf), buf_len(&buf),
+@@ -268,7 +268,7 @@ HIDDEN int backup_real_append_end(struct backup *backup, time_t ts)
+ 
+     unsigned char sha1_rawSHA1_DIGEST_LENGTH;
+     char data_sha12 * SHA1_DIGEST_LENGTH + 1;
+-    SHA1_Final(sha1_raw, &backup->append_state->sha_ctx);
++    SHA1Final(sha1_raw, &backup->append_state->sha_ctx);
+     r = bin_to_hex(sha1_raw, SHA1_DIGEST_LENGTH, data_sha1, BH_LOWER);
+     assert(r == 2 * SHA1_DIGEST_LENGTH);
+ 
+diff --git a/backup/lcb_internal.h b/backup/lcb_internal.h
+index ca07dca45a..1581daf0cf 100644
+--- a/backup/lcb_internal.h
++++ b/backup/lcb_internal.h
+@@ -63,7 +63,7 @@ struct backup_append_state {
+     gzFile gzfile;
+     int chunk_id;
+     size_t wrote;
+-    SHA_CTX sha_ctx;
++    SHA1_CTX sha_ctx;
+ };
+ 
+ struct backup {
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index fb0477a8bf..a8dac204c9 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -143,13 +143,13 @@ static int verify_chunk_checksums(struct backup *backup, struct backup_chunk *ch
+         fprintf(out, "  checking data length\n");
+     char buf8192; /* FIXME whatever */
+     size_t len = 0;
+-    SHA_CTX sha_ctx;
+-    SHA1_Init(&sha_ctx);
++    SHA1_CTX sha_ctx;
++    SHA1Init(&sha_ctx);
+     gzuc_member_start_from(gzuc, chunk->offset);
+     while (!gzuc_member_eof(gzuc)) {
+         ssize_t n = gzuc_read(gzuc, buf, sizeof(buf));
+         if (n >= 0) {
+-            SHA1_Update(&sha_ctx, buf, n);
++            SHA1Update(&sha_ctx, buf, n);
+             len += n;
+         }
+     }
+@@ -172,7 +172,7 @@ static int verify_chunk_checksums(struct backup *backup, struct backup_chunk *ch
+         fprintf(out, "  checking data checksum...\n");
+     unsigned char sha1_rawSHA1_DIGEST_LENGTH;
+     char data_sha12 * SHA1_DIGEST_LENGTH + 1;
+-    SHA1_Final(sha1_raw, &sha_ctx);
++    SHA1Final(sha1_raw, &sha_ctx);
+     r = bin_to_hex(sha1_raw, SHA1_DIGEST_LENGTH, data_sha1, BH_LOWER);
+     assert(r == 2 * SHA1_DIGEST_LENGTH);
+     r = strncmp(chunk->data_sha1, data_sha1, sizeof(data_sha1));
+diff --git a/imap/jmap_calendar.c b/imap/jmap_calendar.c
+index 0b94e81eaf..3322aaa3be 100644
+--- a/imap/jmap_calendar.c
++++ b/imap/jmap_calendar.c
+@@ -7885,19 +7885,19 @@ struct principal_get_rock {
+     struct jmap_get *get;
+     json_t *jaccounts;
+     hash_table *wantids;
+-    SHA_CTX *sha1;
++    SHA1_CTX *sha1;
+ };
+ 
+-static int principal_state_init(jmap_req_t *req, SHA_CTX *sha1)
++static int principal_state_init(jmap_req_t *req, SHA1_CTX *sha1)
+ {
+-    SHA1_Init(sha1);
++    SHA1Init(sha1);
+     char *calhomename = caldav_mboxname(req->userid, NULL);
+     struct mailbox *mbox = NULL;
+     int r = jmap_openmbox(req, calhomename, &mbox, 0);
+     if (!r) {
+         struct buf buf = BUF_INITIALIZER;
+         buf_printf(&buf, "%s" MODSEQ_FMT, req->userid, mailbox_foldermodseq(mbox));
+-        SHA1_Update(sha1, buf_base(&buf), buf_len(&buf));
++        SHA1Update(sha1, buf_base(&buf), buf_len(&buf));
+         buf_free(&buf);
+     }
+     jmap_closembox(req, &mbox);
+@@ -7906,16 +7906,16 @@ static int principal_state_init(jmap_req_t *req, SHA_CTX *sha1)
+ }
+ 
+ static void principal_state_update(jmap_req_t *req __attribute__((unused)),
+-                                   SHA_CTX *sha1,
++                                   SHA1_CTX *sha1,
+                                    const char *accountid)
+ {
+-    SHA1_Update(sha1, accountid, strlen(accountid));
++    SHA1Update(sha1, accountid, strlen(accountid));
+ }
+ 
+-static char *principal_state_string(SHA_CTX *sha1)
++static char *principal_state_string(SHA1_CTX *sha1)
+ {
+     uint8_t digestSHA1_DIGEST_LENGTH;
+-    SHA1_Final(digest, sha1);
++    SHA1Final(digest, sha1);
+     char hexdigestSHA1_DIGEST_LENGTH*2 + 1;
+     bin_to_lchex(digest, SHA1_DIGEST_LENGTH, hexdigest);
+     hexdigestSHA1_DIGEST_LENGTH*2 = '\0';
+@@ -7927,7 +7927,7 @@ static int principal_state_current_cb(jmap_req_t *req,
+                                       int rights __attribute__((unused)),
+                                       void *rock)
+ {
+-    SHA_CTX *sha1 = rock;
++    SHA1_CTX *sha1 = rock;
+     if (strcmp(req->userid, accountid)) {
+         principal_state_update(req, sha1, accountid);
+     }
+@@ -7939,7 +7939,7 @@ static int principal_currentstate(jmap_req_t *req, char **state)
+     /* Principal state is the hash of the authenticated userid, its
+      * calendar home folder modseq and the account ids of all accounts
+      * it where at least one calendar or the calendar home is visible */
+-    SHA_CTX sha1;
++    SHA1_CTX sha1;
+     principal_state_init(req, &sha1);
+     int r = principal_foreach(req, principal_state_current_cb, &sha1);
+     if (!r) {
+@@ -7954,7 +7954,7 @@ static int principal_get_cb(jmap_req_t *req, const char *accountid,
+     struct principal_get_rock *getrock = rock;
+ 
+     /* Update state */
+-    SHA1_Update(getrock->sha1, accountid, strlen(accountid));
++    SHA1Update(getrock->sha1, accountid, strlen(accountid));
+ 
+     /* Convert princpial */
+     if (hash_del(accountid, getrock->wantids)) {
+@@ -8004,7 +8004,7 @@ static int jmap_principal_get(struct jmap_req *req)
+     }
+ 
+     /* Traverse principals */
+-    SHA_CTX sha1;
++    SHA1_CTX sha1;
+     principal_state_init(req, &sha1);
+     struct principal_get_rock rock = { &get, jaccounts, &wantids, &sha1 };
+     int r = principal_foreach(req, principal_get_cb, &rock);
+@@ -8396,15 +8396,15 @@ static int principal_query(jmap_req_t *req, struct jmap_query *query, json_t **e
+     }
+ 
+     /* Make query state */
+-    SHA_CTX sha1;
+-    SHA1_Init(&sha1);
++    SHA1_CTX sha1;
++    SHA1Init(&sha1);
+     size_t i;
+     for (i = 0; i < (size_t) strarray_size(&matches); i++) {
+         const char *id = strarray_nth(&matches, i);
+-        SHA1_Update(&sha1, id, strlen(id));
++        SHA1Update(&sha1, id, strlen(id));
+     }
+     uint8_t digestSHA1_DIGEST_LENGTH;
+-    SHA1_Final(digest, &sha1);
++    SHA1Final(digest, &sha1);
+     char hexdigestSHA1_DIGEST_LENGTH*2 + 1;
+     bin_to_lchex(digest, SHA1_DIGEST_LENGTH, hexdigest);
+     hexdigestSHA1_DIGEST_LENGTH*2 = '\0';
+diff --git a/imap/tls.c b/imap/tls.c
+index f35ef5e2a0..d4e33a5cbe 100644

cyrus-imapd-3.4.4.tar.gz Deleted

cyrus-imapd-3.6.0-rc1.tar.gz Added