Skip to content

CA-208537: vdi-copy between local SRs proposes unwanted ciphers #2666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from Jun 6, 2016
Merged

CA-208537: vdi-copy between local SRs proposes unwanted ciphers #2666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ocaml/xapi/sparse_dd_wrapper.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,15 @@ let dd_internal progress_cb base prezeroed infile outfile size =
"-machine";
"-src"; infile;
"-dest"; outfile;
"-size"; Int64.to_string size
] @ (if prezeroed then [ "-prezeroed" ] else []
"-size"; Int64.to_string size;
"-good-ciphersuites"; (match !Xapi_globs.ciphersuites_good_outbound with
| Some s -> s
| None -> raise (Api_errors.Server_error
(Api_errors.internal_error,["Vdi_copy found no good ciphersuites in Xapi_globs."]))
);
"-legacy-ciphersuites"; !Xapi_globs.ciphersuites_legacy_outbound
] @ (if Stunnel.is_legacy_protocol_and_ciphersuites_allowed () then [ "-ssl-legacy" ] else []
) @ (if prezeroed then [ "-prezeroed" ] else []
) @ (Opt.default [] (Opt.map (fun x -> [ "-base"; x ]) base)) in
debug "%s %s" sparse_dd_path (String.concat " " args);
let pid = Forkhelpers.safe_close_and_exec None (Some pipe_write) (Some log_fd) []
Expand Down