From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 20 Apr 2020 13:43:25 +0000 (+0200)
Subject: BEE Backport bacula/src/filed/crypto.c
X-Git-Tag: Release-11.3.2~1857
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6da53333d3b96cff4cb038a5e9b9975d7ff314ee;p=thirdparty%2Fbacula.git

BEE Backport bacula/src/filed/crypto.c

This commit is the result of the squash of the following main commits:

Author: Kern Sibbald <kern@sibbald.com>
Date:   Wed Mar 28 13:48:00 2018 +0200

    Add prepare bit to the plugin stream and handle it in the SD

Author: Kern Sibbald <kern@sibbald.com>
Date:   Fri Oct 10 08:48:17 2014 +0200

    Implement Win EFS Support

     - Merge kern-refactor-backup branch with 8.1
     - Implement Win EFS simulator
     - Split win efs functions into win_efs.c
     - Add new src/filed/crypto.c file
     - Refactor backup.c, restore.c
---

diff --git a/bacula/src/filed/crypto.c b/bacula/src/filed/crypto.c
index 7ba2afa987..0f0921eb0e 100644
--- a/bacula/src/filed/crypto.c
+++ b/bacula/src/filed/crypto.c
@@ -192,11 +192,11 @@ void crypto_session_end(JCR *jcr)
 bool crypto_session_send(JCR *jcr, BSOCK *sd)
 {
    POOLMEM *msgsave;
+   int32_t stream = STREAM_ENCRYPTED_SESSION_DATA;
 
    /** Send our header */
    Dmsg2(100, "Send hdr fi=%ld stream=%d\n", jcr->JobFiles, STREAM_ENCRYPTED_SESSION_DATA);
-   sd->fsend("%ld %d %lld", jcr->JobFiles, STREAM_ENCRYPTED_SESSION_DATA,
-      (int64_t)jcr->ff->statp.st_size);
+   sd->fsend("%ld %d %lld", jcr->JobFiles, stream, (int64_t)jcr->ff->statp.st_size);
    msgsave = sd->msg;
    sd->msg = jcr->crypto.pki_session_encoded;
    sd->msglen = jcr->crypto.pki_session_encoded_size;
@@ -214,6 +214,7 @@ bool crypto_terminate_digests(bctx_t &bctx)
    JCR *jcr;
    BSOCK *sd;
    FF_PKT *ff_pkt;
+   int32_t stream = STREAM_SIGNED_DIGEST;
 
    jcr = bctx.jcr;
    sd = bctx.sd;
@@ -244,8 +245,8 @@ bool crypto_terminate_digests(bctx_t &bctx)
          sd->msg = realloc_pool_memory(sd->msg, size);
       }
 
-      /** Send our header */
-      sd->fsend("%ld %ld 0", jcr->JobFiles, STREAM_SIGNED_DIGEST);
+      /* Send our header */
+      sd->fsend("%ld %ld 0", jcr->JobFiles, stream);
       Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
 
       /** Encode signature data */