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 6

ssl.patch Deleted

@@ -1,577 +0,0 @@
-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