diff options
| author | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:13:45 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:18:00 +0200 |
| commit | fcc634b483255bedf53f3aea40334c018e13dcce (patch) | |
| tree | 7d59833bd515e295e70ec188e1aa2b1436b3355c /source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem | |
| parent | 97d7291d12e803076022d71556c792b0cd4e60e8 (diff) | |
| parent | 80a1dfddf9086700a8de5fd6005a9179b0bb3d9e (diff) | |
| download | samba-2cd741d5ceefd9e0771f5ea4891bc93baa48a165.tar.gz | |
Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem')
| -rw-r--r-- | source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem new file mode 100644 index 00000000000..e43f14cdd65 --- /dev/null +++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem @@ -0,0 +1,5 @@ +-----BEGIN DH PARAMETERS----- +MGYCYQC/eWD2xkb7uELmqLi+ygPMKyVcpHUo2yCluwnbPutEueuxrG/Cys8j8wLO +svCN/jYNyR2NszOmg7ZWcOC/4z/4pWDVPUZr8qrkhj5MRKJc52MncfaDglvEdJrv +YX70obsCAQI= +-----END DH PARAMETERS----- |