Skip to content

Commit d1586ed

Browse files
cpjuliacpjulia
committed
Merge branch 'devel' of github.com:arangodb/arangodb into feature/supervised-aql-value
2 parents 6b59d61 + e9915a3 commit d1586ed

File tree

5 files changed

+72
-35
lines changed

5 files changed

+72
-35
lines changed

‎etc/testing/makecert.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
# Create CA keypair:
4+
5+
openssl ecparam -name prime256v1 -genkey -noout -out tls-ca.key
6+
openssl req -x509 -new -nodes -extensions v3_ca -key tls-ca.key -days 1024 -out tls-ca.crt -sha512 -subj "/O=ArangoDB/CN=ArangoDB/"
7+
8+
# Produce the key pair signed by the `tls-ca.key`:
9+
10+
openssl ecparam -name prime256v1 -genkey -noout -out key.pem
11+
cat > ssl.conf <<EOF
12+
[req]
13+
prompt = no
14+
distinguished_name = myself
15+
16+
[myself]
17+
O = ArangoDB
18+
CN = ArangoDB
19+
20+
[req_ext]
21+
subjectAltName = @alt_names
22+
23+
[alt_names]
24+
DNS.1 = localhost
25+
DNS.2 = hans.arango.ai
26+
DNS.3 = 127.0.0.1
27+
EOF
28+
29+
openssl req -new -key key.pem -out key-csr.pem -sha512 -config ssl.conf -subj "/O=ArangoDB/CN=localhost"
30+
31+
openssl x509 -req -in key-csr.pem -CA tls-ca.crt -days 3650 -CAkey tls-ca.key -out cert.pem -extensions req_ext -extfile ssl.conf -CAcreateserial
32+
33+
# Put server certificate, CA certificate and server key into keyfile.
34+
# Note that the order is important here: The server cert must go before
35+
# the CA cert!
36+
cat cert.pem tls-ca.crt key.pem > tls.keyfile

‎etc/testing/tls-ca.crt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBiTCCAS+gAwIBAgIRAPjpM679uKG2EUMP49KjUeQwCgYIKoZIzj0EAwIwJjER
3-
MA8GA1UEChMIQXJhbmdvREIxETAPBgNVBAMTCEFyYW5nb0RCMB4XDTIwMDIxNzEy
4-
NTc0MloXDTM1MDIxMzEyNTc0MlowJjERMA8GA1UEChMIQXJhbmdvREIxETAPBgNV
5-
BAMTCEFyYW5nb0RCMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQmA2AzR/6SAH
6-
qlOrfUx0mCWHbFVaux3b42Nzqynb0poRzDbMPiJKFd3Hy0IVRfa2nNcGGYF/ekv1
7-
JW8C+ZXdpqM+MDwwDgYDVR0PAQH/BAQDAgKkMBkGA1UdJQQSMBAGBFUdJQAGCCsG
8-
AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIgW0EnfKLF
9-
rWlfBC2e4dJETZ1oeGiUsmYDTpg3byiG0GsCIQD5pNYAw+iMABgUEb4Vp/yj/ZlB
10-
E72mWZfsnTvTtJcw6w==
2+
MIIBoTCCAUegAwIBAgIURsHau9Z+PiuRXQ3qd0K2bks/1IEwCgYIKoZIzj0EAwQw
3+
JjERMA8GA1UECgwIQXJhbmdvREIxETAPBgNVBAMMCEFyYW5nb0RCMB4XDTI1MTIx
4+
MDE0MTIxOVoXDTI4MDkyOTE0MTIxOVowJjERMA8GA1UECgwIQXJhbmdvREIxETAP
5+
BgNVBAMMCEFyYW5nb0RCMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6Y5Zu64e
6+
6aI4+2UDsaHxouTbHdDv+1e2yxmabgpDnisLfOeEt5mPIVH6KuufKy3XMFiknftA
7+
lX4L3EisJiZkeqNTMFEwHQYDVR0OBBYEFPUW4043A8Is9mznJRwyxmxCWjLVMB8G
8+
A1UdIwQYMBaAFPUW4043A8Is9mznJRwyxmxCWjLVMA8GA1UdEwEB/wQFMAMBAf8w
9+
CgYIKoZIzj0EAwQDSAAwRQIhAJreUhd0wjGvEKLlkyFQ+fW0S4S3IgH9S7q+XBQd
10+
LGRgAiB9f/1PlEHN6r5FKZEfZYdKu/hFN6Nof8Rxcttvox4P0Q==
1111
-----END CERTIFICATE-----

‎etc/testing/tls-ca.key‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----BEGIN EC PRIVATE KEY-----
2-
MHcCAQEEIJ8VLjNAdSGk40iM9X4C3Ken/VmIU1Lp390mes3e9MofoAoGCCqGSM49
3-
AwEHoUQDQgAEQmA2AzR/6SAHqlOrfUx0mCWHbFVaux3b42Nzqynb0poRzDbMPiJK
4-
Fd3Hy0IVRfa2nNcGGYF/ekv1JW8C+ZXdpg==
2+
MHcCAQEEIJpzEWf2SsLTAmRgTu0zF3esovsCu7be2C5jDprG0PoGoAoGCCqGSM49
3+
AwEHoUQDQgAE6Y5Zu64e6aI4+2UDsaHxouTbHdDv+1e2yxmabgpDnisLfOeEt5mP
4+
IVH6KuufKy3XMFiknftAlX4L3EisJiZkeg==
55
-----END EC PRIVATE KEY-----

‎etc/testing/tls-ca.srl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
086B6F1B4E0FB99EC3AAEEEA570A38BA48461D53

‎etc/testing/tls.keyfile‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBtTCCAVugAwIBAgIQCLL/gsE5ulCzqSbpgUhrmjAKBggqhkjOPQQDAjAmMREw
3-
DwYDVQQKEwhBcmFuZ29EQjERMA8GA1UEAxMIQXJhbmdvREIwHhcNMjAwMjE3MTQ0
4-
MDEzWhcNNDIxMjExMjI0MDEzWjAnMREwDwYDVQQKEwhBcmFuZ29EQjESMBAGA1UE
5-
AxMJbG9jYWxob3N0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhTf30T85HKSB
6-
zkqJBeozMjHrWY4jN7617OE0AuHMPhfG9T8hMM7ccA+18VZqZXAUF5rc5CK02yI3
7-
xlV/kMDuWKNqMGgwDgYDVR0PAQH/BAQDAgWgMBkGA1UdJQQSMBAGBFUdJQAGCCsG
8-
AQUFBwMBMAwGA1UdEwEB/wQCMAAwLQYDVR0RBCYwJIIJbG9jYWxob3N0ghFoYW5z
9-
LmFyYW5nb2RiLmNvbYcEfwAAATAKBggqhkjOPQQDAgNIADBFAiEA9KMxT5SSEpIe
10-
b8ltTQB/jvTwNghuF9WsTB483JzqJyECIAEbBDx/jfBoV+sDApeHRuHTptb08Wnn
11-
JxuzoVE+rDPc
2+
MIIBwzCCAWigAwIBAgIUCGtvG04PuZ7Dqu7qVwo4ukhGHVMwCgYIKoZIzj0EAwIw
3+
JjERMA8GA1UECgwIQXJhbmdvREIxETAPBgNVBAMMCEFyYW5nb0RCMB4XDTI1MTIx
4+
MDE0MTIxOVoXDTM1MTIwODE0MTIxOVowJzERMA8GA1UECgwIQXJhbmdvREIxEjAQ
5+
BgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIHLaydo
6+
H+7i9x9caAotISJ7hBFRhJMvo0aMUEmtqmKegewwzOm4TCuzaVzFXDPQuOMU1xJt
7+
yHYl2UZm4oWPozKjczBxMC8GA1UdEQQoMCaCCWxvY2FsaG9zdIIOaGFucy5hcmFu
8+
Z28uYWmCCTEyNy4wLjAuMTAdBgNVHQ4EFgQU9nrUsTZxZU7y7wH+oQTiu62wIWgw
9+
HwYDVR0jBBgwFoAU9RbjTjcDwiz2bOclHDLGbEJaMtUwCgYIKoZIzj0EAwIDSQAw
10+
RgIhANhzHn/oCO+4mZ61Sgy43ld/jG7xmxC902zEFvB4vtivAiEAlUK9TE7rgf5F
11+
PltUw/Fp2spWCtWbQd6ROYBI9Cvn9IM=
1212
-----END CERTIFICATE-----
1313
-----BEGIN CERTIFICATE-----
14-
MIIBiTCCAS+gAwIBAgIRAPjpM679uKG2EUMP49KjUeQwCgYIKoZIzj0EAwIwJjER
15-
MA8GA1UEChMIQXJhbmdvREIxETAPBgNVBAMTCEFyYW5nb0RCMB4XDTIwMDIxNzEy
16-
NTc0MloXDTM1MDIxMzEyNTc0MlowJjERMA8GA1UEChMIQXJhbmdvREIxETAPBgNV
17-
BAMTCEFyYW5nb0RCMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQmA2AzR/6SAH
18-
qlOrfUx0mCWHbFVaux3b42Nzqynb0poRzDbMPiJKFd3Hy0IVRfa2nNcGGYF/ekv1
19-
JW8C+ZXdpqM+MDwwDgYDVR0PAQH/BAQDAgKkMBkGA1UdJQQSMBAGBFUdJQAGCCsG
20-
AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIgW0EnfKLF
21-
rWlfBC2e4dJETZ1oeGiUsmYDTpg3byiG0GsCIQD5pNYAw+iMABgUEb4Vp/yj/ZlB
22-
E72mWZfsnTvTtJcw6w==
14+
MIIBoTCCAUegAwIBAgIURsHau9Z+PiuRXQ3qd0K2bks/1IEwCgYIKoZIzj0EAwQw
15+
JjERMA8GA1UECgwIQXJhbmdvREIxETAPBgNVBAMMCEFyYW5nb0RCMB4XDTI1MTIx
16+
MDE0MTIxOVoXDTI4MDkyOTE0MTIxOVowJjERMA8GA1UECgwIQXJhbmdvREIxETAP
17+
BgNVBAMMCEFyYW5nb0RCMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6Y5Zu64e
18+
6aI4+2UDsaHxouTbHdDv+1e2yxmabgpDnisLfOeEt5mPIVH6KuufKy3XMFiknftA
19+
lX4L3EisJiZkeqNTMFEwHQYDVR0OBBYEFPUW4043A8Is9mznJRwyxmxCWjLVMB8G
20+
A1UdIwQYMBaAFPUW4043A8Is9mznJRwyxmxCWjLVMA8GA1UdEwEB/wQFMAMBAf8w
21+
CgYIKoZIzj0EAwQDSAAwRQIhAJreUhd0wjGvEKLlkyFQ+fW0S4S3IgH9S7q+XBQd
22+
LGRgAiB9f/1PlEHN6r5FKZEfZYdKu/hFN6Nof8Rxcttvox4P0Q==
2323
-----END CERTIFICATE-----
2424
-----BEGIN EC PRIVATE KEY-----
25-
MHcCAQEEIJn82W+gXecn28BUIBjNseASBLp7zl31EPfmoul4H0uwoAoGCCqGSM49
26-
AwEHoUQDQgAEhTf30T85HKSBzkqJBeozMjHrWY4jN7617OE0AuHMPhfG9T8hMM7c
27-
cA+18VZqZXAUF5rc5CK02yI3xlV/kMDuWA==
28-
-----END EC PRIVATE KEY-----
25+
MHcCAQEEIMQTNiXBWDQpaCW1RrXH6m6U8Bp98jar3hI76+OuCsU4oAoGCCqGSM49
26+
AwEHoUQDQgAEgctrJ2gf7uL3H1xoCi0hInuEEVGEky+jRoxQSa2qYp6B7DDM6bhM
27+
K7NpXMVcM9C44xTXEm3IdiXZRmbihY+jMg==
28+
-----END EC PRIVATE KEY-----

0 commit comments

Comments
 (0)