Skip to content

Commit 6465cec

Browse files
pennampennam
committed
SecureElement: move build functions in separate files
1 parent aa67e37 commit 6465cec

File tree

6 files changed

+202
-62
lines changed

6 files changed

+202
-62
lines changed

‎src/SecureElement.cpp‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -41,65 +41,6 @@ SecureElement::SecureElement()
4141
* PUBLIC MEMBER FUNCTIONS
4242
******************************************************************************/
4343

44-
int SecureElement::buildCSR(ECP256Certificate & cert, const int keySlot, bool newPrivateKey)
45-
{
46-
byte publicKey[ECP256_CERT_PUBLIC_KEY_LENGTH];
47-
byte signature[ECP256_CERT_SIGNATURE_LENGTH];
48-
49-
if (newPrivateKey) {
50-
if (!_secureElement.generatePrivateKey(keySlot, publicKey)) {
51-
return 0;
52-
}
53-
} else {
54-
if (!_secureElement.generatePublicKey(keySlot, publicKey)) {
55-
return 0;
56-
}
57-
}
58-
59-
/* Store public key in csr */
60-
if (!cert.setPublicKey(publicKey, ECP256_CERT_PUBLIC_KEY_LENGTH)) {
61-
return 0;
62-
}
63-
64-
/* Build CSR */
65-
if (!cert.buildCSR()) {
66-
return 0;
67-
}
68-
69-
/* compute CSR SHA256 */
70-
byte sha256buf[SE_SHA256_BUFFER_LENGTH];
71-
this->SHA256(cert.bytes(), cert.length(), sha256buf);
72-
73-
if (!_secureElement.ecSign(keySlot, sha256buf, signature)) {
74-
return 0;
75-
}
76-
77-
/* sign CSR */
78-
return cert.signCSR(signature);
79-
}
80-
81-
int SecureElement::buildCert(ECP256Certificate & cert, const int keySlot)
82-
{
83-
byte publicKey[ECP256_CERT_PUBLIC_KEY_LENGTH];
84-
85-
if (!_secureElement.generatePublicKey(keySlot, publicKey)) {
86-
return 0;
87-
}
88-
89-
/* Store public key in csr */
90-
if (!cert.setPublicKey(publicKey, ECP256_CERT_PUBLIC_KEY_LENGTH)) {
91-
return 0;
92-
}
93-
94-
/* Build CSR */
95-
if (!cert.buildCert()) {
96-
return 0;
97-
}
98-
99-
/* sign CSR */
100-
return cert.signCert();
101-
}
102-
10344
int SecureElement::writeCert(ECP256Certificate & cert, const int certSlot)
10445
{
10546
#if defined(BOARD_HAS_SE050)

‎src/SecureElement.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ class SecureElement
8181
inline int writeConfiguration(const byte config[] = nullptr) { return _secureElement.writeConfiguration(config); }
8282
#endif
8383

84-
int buildCSR(ECP256Certificate & cert, const int keySlot, bool newPrivateKey);
85-
int buildCert(ECP256Certificate & cert, const int keySlot);
86-
8784
int writeCert(ECP256Certificate & cert, const int certSlot);
8885
int readCert(ECP256Certificate & cert, const int certSlot);
8986

‎src/utility/SElementCSR.cpp‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
SElementCSR.cpp
3+
Copyright (c) 2023 Arduino SA. All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
/******************************************************************************
21+
* INCLUDE
22+
******************************************************************************/
23+
24+
#include <utility/SElementCSR.h>
25+
26+
int SElementCSR::build(SecureElement & se, ECP256Certificate & cert, const int keySlot, bool newPrivateKey)
27+
{
28+
byte publicKey[ECP256_CERT_PUBLIC_KEY_LENGTH];
29+
byte signature[ECP256_CERT_SIGNATURE_LENGTH];
30+
31+
if (newPrivateKey) {
32+
if (!se.generatePrivateKey(keySlot, publicKey)) {
33+
return 0;
34+
}
35+
} else {
36+
if (!se.generatePublicKey(keySlot, publicKey)) {
37+
return 0;
38+
}
39+
}
40+
41+
/* Store public key in CSR */
42+
if (!cert.setPublicKey(publicKey, ECP256_CERT_PUBLIC_KEY_LENGTH)) {
43+
return 0;
44+
}
45+
46+
/* Build CSR */
47+
if (!cert.buildCSR()) {
48+
return 0;
49+
}
50+
51+
/* compute CSR SHA256 */
52+
byte sha256buf[SE_SHA256_BUFFER_LENGTH];
53+
se.SHA256(cert.bytes(), cert.length(), sha256buf);
54+
55+
if (!se.ecSign(keySlot, sha256buf, signature)) {
56+
return 0;
57+
}
58+
59+
/* sign CSR */
60+
return cert.signCSR(signature);
61+
}

‎src/utility/SElementCSR.h‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
SElementCSR.h
3+
Copyright (c) 2023 Arduino SA. All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
#ifndef SECURE_ELEMENT_CSR_H_
21+
#define SECURE_ELEMENT_CSR_H_
22+
23+
/******************************************************************************
24+
* INCLUDE
25+
******************************************************************************/
26+
27+
#include <Arduino_SecureElement.h>
28+
29+
/******************************************************************************
30+
* CLASS DECLARATION
31+
******************************************************************************/
32+
33+
class SElementCSR
34+
{
35+
public:
36+
37+
static int build(SecureElement & se, ECP256Certificate & cert, const int keySlot, bool newPrivateKey);
38+
39+
};
40+
41+
#endif /* SECURE_ELEMENT_CSR_H_ */

‎src/utility/SElementCertificate.cpp‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
SElementCertificate.cpp
3+
Copyright (c) 2023 Arduino SA. All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
/******************************************************************************
21+
* INCLUDE
22+
******************************************************************************/
23+
24+
#include <utility/SElementCertificate.h>
25+
26+
int SElementCertificate::build(SecureElement & se, ECP256Certificate & cert, const int keySlot, bool newPrivateKey, bool selfSign)
27+
{
28+
byte publicKey[ECP256_CERT_PUBLIC_KEY_LENGTH];
29+
byte signature[ECP256_CERT_SIGNATURE_LENGTH];
30+
31+
if (!se.generatePublicKey(keySlot, publicKey)) {
32+
return 0;
33+
}
34+
35+
/* Store public key in Certificate */
36+
if (!cert.setPublicKey(publicKey, ECP256_CERT_PUBLIC_KEY_LENGTH)) {
37+
return 0;
38+
}
39+
40+
/* Build Certificate */
41+
if (!cert.buildCert()) {
42+
return 0;
43+
}
44+
45+
if (selfSign) {
46+
byte sha256buf[SE_SHA256_BUFFER_LENGTH];
47+
se.SHA256(cert.bytes(), cert.length(), sha256buf);
48+
49+
if (!se.ecSign(keySlot, sha256buf, signature)) {
50+
return 0;
51+
}
52+
53+
/* self sign Certificate */
54+
return cert.signCert(signature);
55+
}
56+
57+
/* sign Certificate */
58+
return cert.signCert();
59+
}

‎src/utility/SElementCertificate.h‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
SElementCertificate.h
3+
Copyright (c) 2023 Arduino SA. All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
#ifndef SECURE_ELEMENT_SSC_H_
21+
#define SECURE_ELEMENT_SSC_H_
22+
23+
/******************************************************************************
24+
* INCLUDE
25+
******************************************************************************/
26+
27+
#include <Arduino_SecureElement.h>
28+
29+
/******************************************************************************
30+
* CLASS DECLARATION
31+
******************************************************************************/
32+
33+
class SElementCertificate
34+
{
35+
public:
36+
37+
static int build(SecureElement & se, ECP256Certificate & cert, const int keySlot, bool newPrivateKey = true, bool selfSign = false);
38+
39+
};
40+
41+
#endif /* SECURE_ELEMENT_SSC_H_ */

0 commit comments

Comments
 (0)