Commit be7fd1f7 authored by apapkovskiy's avatar apapkovskiy
Browse files

Added create keysscript

parent 62625b41
......@@ -218,12 +218,14 @@ void* jrcp_clientthread(void* args)
{
case -1:
FPRINTF("recv() failed.\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
break;
case 0:
FPRINTF("Connection closed by client (%d)\n", nRcv);
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
break;
......@@ -238,6 +240,7 @@ void* jrcp_clientthread(void* args)
if (send(client_args->client_fd, JRCP_RSP_TERMINAL_INFO, sizeof(JRCP_RSP_TERMINAL_INFO), 0) == -1)
{
EPRINTF("Sending TERMINAL_INFO_RSP failed\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -249,6 +252,7 @@ void* jrcp_clientthread(void* args)
if(jrcp_parsemsg(&msg, rcvBuf, nRcv) == -1)
{
EPRINTF("Malformed JRCP message\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -261,6 +265,7 @@ void* jrcp_clientthread(void* args)
if (send(client_args->client_fd, JRCP_RSP_CONTROLLER_CONFIG, sizeof(JRCP_RSP_CONTROLLER_CONFIG), 0) == -1)
{
EPRINTF("Sending CONTROLLER_CONFIG_RSP failed\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -269,6 +274,7 @@ void* jrcp_clientthread(void* args)
if (send(client_args->client_fd, JRCP_RSP_COLD_RESET, sizeof(JRCP_RSP_COLD_RESET), 0) == -1)
{
EPRINTF("Sending COLD_RESET_RSP failed\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -283,6 +289,7 @@ void* jrcp_clientthread(void* args)
if (send(client_args->client_fd, sndBuf, rspLen + 9, 0) == -1)
{
EPRINTF("Sending SEND_DATA_RSP failed\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -292,10 +299,12 @@ void* jrcp_clientthread(void* args)
}
case JRCP_INVALID_MSG:
EPRINTF("Invalid message. Closing socket. Bye!\n");
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
default:
EPRINTF("Don't know how to deal with Message Type 0x%02X.\n", rcvBuf[0]);
close(client_args->client_fd);
free(client_args);
pthread_exit(NULL);
}
......@@ -469,6 +478,7 @@ int main(void)
if (new_fd == -1)
{
EPRINTF("accept");
//exit(1);
continue;
}
......
#!/bin/bash
set -x
PATH_TO_BIN=jrcp/lib
cd ${SNAP_COMMON}/certs
$SNAP/$PATH_TO_BIN/A71CHConfigTool 11.11.11.11:8080 erase pair -x 0
$SNAP/$PATH_TO_BIN/A71CHConfigTool 11.11.11.11:8080 gen pair -x 0
$SNAP/$PATH_TO_BIN/A71CHConfigTool 11.11.11.11:8080 refpem -c 10 -x 0 -r ${SNAP_COMMON}/certs/deviceRefKey.ref_key
openssl req -new -key deviceRefKey.ref_key -out deviceCsr.csr -subj "/CN=A71CH_KEY"
openssl x509 -req -days 3650 -in deviceCsr.csr -CAcreateserial -CA CACertificate_ECC.crt -CAkey CACertificate_ECC.key -out deviceCert.crt
cat deviceCert.crt CACertificate_ECC.crt > CAandIoTcert.pem
-----BEGIN CERTIFICATE-----
MIIB0TCCAXegAwIBAgIJALKU6f36XQnAMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn
aXRzIFB0eSBMdGQwHhcNMTgxMjEwMDkzOTE5WhcNMjgxMjA3MDkzOTE5WjBFMQsw
CQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJu
ZXQgV2lkZ2l0cyBQdHkgTHRkMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZ/Wf
eeYhIfhHKAbWTQfpU6oQlzqi8G/9UJcQLRhkCXmdBjQN6PyeuI16O8wBXEPBAUrC
1l0R5+/Y6ldwNkIarKNQME4wHQYDVR0OBBYEFHWZRJxOikjvif01ZFBeXbnw92VZ
MB8GA1UdIwQYMBaAFHWZRJxOikjvif01ZFBeXbnw92VZMAwGA1UdEwQFMAMBAf8w
CgYIKoZIzj0EAwIDSAAwRQIhAO+Z+hzv2XJ0uT+yiyOIcc5dNyKrjuOyeu8RrMuE
KzktAiA6/ozj0I1FLAH3Q2R9M5xIZW/UHNxTwl8TuHPxOVe7jg==
-----END CERTIFICATE-----
-----BEGIN EC PARAMETERS-----
BggqhkjOPQMBBw==
-----END EC PARAMETERS-----
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEINjXlj/SeHjtm3tLPV1a+9cZQrfFA9cz5YFhZQw2SPPDoAoGCCqGSM49
AwEHoUQDQgAEZ/WfeeYhIfhHKAbWTQfpU6oQlzqi8G/9UJcQLRhkCXmdBjQN6Pye
uI16O8wBXEPBAUrC1l0R5+/Y6ldwNkIarA==
-----END EC PRIVATE KEY-----
openssl_conf = nxp_engine
# this is completely broken!!! expecting errors!
#
# OpenSSL example configuration file.
# This is mostly being used for generation of certificate requests.
#
# This definition stops the following lines choking if HOME isn't
# defined.
HOME = .
RANDFILE = $ENV::HOME/.rnd
openssl_conf = nxp_engine
# Extra OBJECT IDENTIFIER info:
#oid_file = $ENV::HOME/.oid
oid_section = new_oids
# To use this configuration file with the "-extfile" option of the
# "openssl x509" utility, name here the section containing the
# X.509v3 extensions to use:
# extensions =
# (Alternatively, use a configuration file that has only
# X.509v3 extensions in its main [= default] section.)
[ new_oids ]
# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
# Add a simple OID like this:
# testoid1=1.2.3.4
# Or use config file substitution like this:
# testoid2=${testoid1}.5.6
# Policies used by the TSA examples.
tsa_policy1 = 1.2.3.4.1
tsa_policy2 = 1.2.3.4.5.6
tsa_policy3 = 1.2.3.4.5.7
####################################################################
[ ca ]
default_ca = CA_default # The default ca section
####################################################################
[ CA_default ]
dir = ./demoCA # Where everything is kept
certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.
#unique_subject = no # Set to 'no' to allow creation of
# several ctificates with same subject.
new_certs_dir = $dir/newcerts # default place for new certs.
certificate = $dir/cacert.pem # The CA certificate
serial = $dir/serial # The current serial number
crlnumber = $dir/crlnumber # the current crl number
# must be commented out to leave a V1 CRL
crl = $dir/crl.pem # The current CRL
private_key = $dir/private/cakey.pem# The private key
RANDFILE = $dir/private/.rand # private random number file
x509_extensions = usr_cert # The extentions to add to the cert
# Comment out the following two lines for the "traditional"
# (and highly broken) format.
name_opt = ca_default # Subject Name options
cert_opt = ca_default # Certificate field options
# Extension copying option: use with caution.
# copy_extensions = copy
# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
# so this is commented out by default to leave a V1 CRL.
# crlnumber must also be commented out to leave a V1 CRL.
# crl_extensions = crl_ext
default_days = 365 # how long to certify for
default_crl_days= 30 # how long before next CRL
default_md = default # use public key default MD
preserve = no # keep passed DN ordering
# A few difference way of specifying how similar the request should look
# For type CA, the listed attributes must be the same, and the optional
# and supplied fields are just that :-)
policy = policy_match
# For the CA policy
[ policy_match ]
countryName = match
stateOrProvinceName = match
organizationName = match
organizationalUnitName = optional
commonName = supplied
emailAddress = optional
# For the 'anything' policy
# At this point in time, you must list all acceptable 'object'
# types.
[ policy_anything ]
countryName = optional
stateOrProvinceName = optional
localityName = optional
organizationName = optional
organizationalUnitName = optional
commonName = supplied
emailAddress = optional
####################################################################
[ req ]
default_bits = 2048
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
x509_extensions = v3_ca # The extentions to add to the self signed cert
# Passwords for private keys if not present they will be prompted for
# input_password = secret
# output_password = secret
# This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
# utf8only: only UTF8Strings (PKIX recommendation after 2004).
# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
# MASK:XXXX a literal mask value.
# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
string_mask = utf8only
# req_extensions = v3_req # The extensions to add to a certificate request
[ req_distinguished_name ]
countryName = Country Name (2 letter code)
countryName_default = AU
countryName_min = 2
countryName_max = 2
stateOrProvinceName = State or Province Name (full name)
stateOrProvinceName_default = Some-State
localityName = Locality Name (eg, city)
0.organizationName = Organization Name (eg, company)
0.organizationName_default = Internet Widgits Pty Ltd
# we can do this but it is not needed normally :-)
#1.organizationName = Second Organization Name (eg, company)
#1.organizationName_default = World Wide Web Pty Ltd
organizationalUnitName = Organizational Unit Name (eg, section)
#organizationalUnitName_default =
commonName = Common Name (e.g. server FQDN or YOUR name)
commonName_max = 64
emailAddress = Email Address
emailAddress_max = 64
# SET-ex3 = SET extension number 3
[ req_attributes ]
challengePassword = A challenge password
challengePassword_min = 4
challengePassword_max = 20
unstructuredName = An optional company name
[ usr_cert ]
# These extensions are added when 'ca' signs a request.
# This goes against PKIX guidelines but some CAs do it and some software
# requires this to avoid interpreting an end user certificate as a CA.
basicConstraints=CA:FALSE
# Here are some examples of the usage of nsCertType. If it is omitted
# the certificate can be used for anything *except* object signing.
# This is OK for an SSL server.
# nsCertType = server
# For an object signing certificate this would be used.
# nsCertType = objsign
# For normal client use this is typical
# nsCertType = client, email
# and for everything including object signing:
# nsCertType = client, email, objsign
# This is typical in keyUsage for a client certificate.
# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
# This will be displayed in Netscape's comment listbox.
nsComment = "OpenSSL Generated Certificate"
# PKIX recommendations harmless if included in all certificates.
subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid,issuer
# This stuff is for subjectAltName and issuerAltname.
# Import the email address.
# subjectAltName=email:copy
# An alternative to produce certificates that aren't
# deprecated according to PKIX.
# subjectAltName=email:move
# Copy subject details
# issuerAltName=issuer:copy
#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
#nsBaseUrl
#nsRevocationUrl
#nsRenewalUrl
#nsCaPolicyUrl
#nsSslServerName
# This is required for TSA certificates.
# extendedKeyUsage = critical,timeStamping
[ v3_req ]
# Extensions to add to a certificate request
basicConstraints = CA:FALSE
keyUsage = nonRepudiation, digitalSignature, keyEncipherment
[ v3_ca ]
# Extensions for a typical CA
# PKIX recommendation.
subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid:always,issuer
# This is what PKIX recommends but some broken software chokes on critical
# extensions.
#basicConstraints = critical,CA:true
# So we do this instead.
basicConstraints = CA:true
# Key usage: this is typical for a CA certificate. However since it will
# prevent it being used as an test self-signed certificate it is best
# left out by default.
# keyUsage = cRLSign, keyCertSign
# Some might want this also
# nsCertType = sslCA, emailCA
# Include email address in subject alt name: another PKIX recommendation
# subjectAltName=email:copy
# Copy issuer details
# issuerAltName=issuer:copy
# DER hex encoding of an extension: beware experts only!
# obj=DER:02:03
# Where 'obj' is a standard or added object
# You can even override a supported extension:
# basicConstraints= critical, DER:30:03:01:01:FF
[ crl_ext ]
# CRL extensions.
# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
# issuerAltName=issuer:copy
authorityKeyIdentifier=keyid:always
[ proxy_cert_ext ]
# These extensions should be added when creating a proxy certificate
# This goes against PKIX guidelines but some CAs do it and some software
# requires this to avoid interpreting an end user certificate as a CA.
basicConstraints=CA:FALSE
# Here are some examples of the usage of nsCertType. If it is omitted
# the certificate can be used for anything *except* object signing.
# This is OK for an SSL server.
# nsCertType = server
# For an object signing certificate this would be used.
# nsCertType = objsign
# For normal client use this is typical
# nsCertType = client, email
# and for everything including object signing:
# nsCertType = client, email, objsign
# This is typical in keyUsage for a client certificate.
# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
# This will be displayed in Netscape's comment listbox.
nsComment = "OpenSSL Generated Certificate"
# PKIX recommendations harmless if included in all certificates.
subjectKeyIdentifier=hash
authorityKeyIdentifier=keyid,issuer
# This stuff is for subjectAltName and issuerAltname.
# Import the email address.
# subjectAltName=email:copy
# An alternative to produce certificates that aren't
# deprecated according to PKIX.
# subjectAltName=email:move
# Copy subject details
# issuerAltName=issuer:copy
#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
#nsBaseUrl
#nsRevocationUrl
#nsRenewalUrl
#nsCaPolicyUrl
#nsSslServerName
# This really needs to be in place for it to be a proxy certificate.
proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
####################################################################
[ tsa ]
default_tsa = tsa_config1 # the default TSA section
[ tsa_config1 ]
# These are used by the TSA reply generation only.
dir = ./demoCA # TSA root directory
serial = $dir/tsaserial # The current serial number (mandatory)
crypto_device = builtin # OpenSSL engine to use for signing
signer_cert = $dir/tsacert.pem # The TSA signing certificate
# (optional)
certs = $dir/cacert.pem # Certificate chain to include in reply
# (optional)
signer_key = $dir/private/tsakey.pem # The TSA private key (optional)
default_policy = tsa_policy1 # Policy if request did not specify it
# (optional)
other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional)
digests = md5, sha1 # Acceptable message digests (mandatory)
accuracy = secs:1, millisecs:500, microsecs:100 # (optional)
clock_precision_digits = 0 # number of digits after dot. (optional)
ordering = yes # Is ordering defined for timestamps?
# (optional, default: no)
tsa_name = yes # Must the TSA name be included in the reply?
# (optional, default: no)
ess_cert_id_chain = no # Must the ESS cert id chain be included?
# (optional, default: no)
[nxp_engine]
engines = engine_section
......
openssl_conf = nxp_engine
[nxp_engine]
engines = engine_section
[engine_section]
e2a71ch = e2a71ch_section
[e2a71ch_section]
engine_id = e2a71ch
dynamic_path = $ENV::SNAP/jrcp/lib/libsss_a71ch_engine.so
default_algorithms = RAND,ECDSA,ECDH
init = 1
openssl_conf = nxp_engine
[nxp_engine]
engines = engine_section
[engine_section]
e2a71ch = e2a71ch_section
[e2a71ch_section]
engine_id = e2a71ch
dynamic_path = $ENV::SNAP/jrcp/lib/libsss_a71ch_engine.so
default_algorithms = RAND,ECDSA,ECDH
init = 1
-----BEGIN CERTIFICATE-----
MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF
ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL
MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj
ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM
9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw
IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6
VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L
93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm
jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA
A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI
U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs
N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv
o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy
rqXRfboQnoZsG4q5WTP468SQvvG5
-----END CERTIFICATE-----
#!/usr/bin/env bash
set -x
exec >> ${SNAP_COMMON}/configure-hook.log 2>&1
echo "$(date '+%Y-%m-%d %H:%M:%S') configure-hook: Entering hook"
mkdir -p ${SNAP_COMMON}/certs
cp -rf ${SNAP}/certs/* ${SNAP_COMMON}/certs
......@@ -12,7 +12,7 @@ slots:
interface: content
content: lib-cert
read:
- certs
- $SNAP_COMMON/certs
lib-engine:
interface: content
content: lib-engine
......@@ -35,6 +35,7 @@ parts:
- -DWithHostCrypto_MBEDTLS=OFF
- -DWithSMCOM_VCOM=OFF
- -DWithSMCOM_SCI2C=ON
- -DCMAKE_INSTALL_PREFIX=/sci2c
override-build: |
snapcraftctl build
mkdir -p ${SNAPCRAFT_PART_INSTALL}/bin
......@@ -59,6 +60,7 @@ parts:
override-build: |
snapcraftctl build
cp ./ext/jrcplib/libjrcplib.so ${SNAPCRAFT_PART_INSTALL}/jrcp/lib
cp ./bin/A71CHConfigTool ${SNAPCRAFT_PART_INSTALL}/jrcp/lib/A71CHConfigTool
rootfs:
plugin: dump
......@@ -66,9 +68,27 @@ parts:
apps:
jrcp-server:
environment:
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/sci2c/lib
command: "bin/start-simple-server"
daemon: simple
plugs: &default-plugs [network-bind, network-control, network-setup-control, network]
A71CHConfigTool:
A71CHConfigToolSCI2C:
environment:
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/sci2c/lib
command: "bin/A71CHConfigTool"
plugs: *default-plugs
A71CHConfigToolJRCP:
environment:
JRCP_HOSTNAME: 172.27.1.199
OPENSSL_CONF: $SNAP/certs/opensslA71CH.cnf
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/jrcp/lib
command: "jrcp/lib/A71CHConfigTool"
plugs: *default-plugs
init-A71CH:
environment:
JRCP_HOSTNAME: 172.27.1.199
OPENSSL_CONF: $SNAP/certs/opensslA71CH.cnf
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/jrcp/lib
command: "bin/init_A71CH"
plugs: *default-plugs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment