forked from clearlinux-pkgs/linux-iot-lts2018
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0028-tools-rpmb-add-support-for-nvme-device.patch
1139 lines (1074 loc) · 31.2 KB
/
0028-tools-rpmb-add-support-for-nvme-device.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 171fd7e60f4af468b6ff4d902db7a1d1f6d1fca0 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <[email protected]>
Date: Mon, 30 Apr 2018 12:57:51 +0300
Subject: [PATCH 13/22] tools/rpmb: add support for nvme device
Change-Id: Iab3171a22d3f502b11beed1496959bfd8f47d568
Signed-off-by: Tomas Winkler <[email protected]>
---
tools/rpmb/rpmb.c | 816 +++++++++++++++++++++++++++++++++++++---------
1 file changed, 656 insertions(+), 160 deletions(-)
diff --git a/tools/rpmb/rpmb.c b/tools/rpmb/rpmb.c
index 1a507db2739e..28b2280776d5 100644
--- a/tools/rpmb/rpmb.c
+++ b/tools/rpmb/rpmb.c
@@ -31,6 +31,11 @@
#define RPMB_MAC_SIZE 32
#define RPMB_NONCE_SIZE 16
+#define RPMB_FRAME_TYPE_JDEC 0
+#define RPMB_FRAME_TYPE_NVME 1
+#define RPMB_BLOCK_SIZE 256
+#define RPMB_SECTOR_SIZE 512
+
bool verbose;
#define rpmb_dbg(fmt, ARGS...) do { \
if (verbose) \
@@ -239,9 +244,10 @@ static ssize_t write_file(int fd, unsigned char *data, size_t size)
return ret;
}
-static void dbg_dump_frame(const char *title, const struct rpmb_frame_jdec *f)
+static void dbg_dump_frame_jdec(const char *title, const void *f, uint32_t cnt)
{
uint16_t result, req_resp;
+ const struct rpmb_frame_jdec *frame = f;
if (!verbose)
return;
@@ -249,37 +255,405 @@ static void dbg_dump_frame(const char *title, const struct rpmb_frame_jdec *f)
if (!f)
return;
- result = be16toh(f->result);
- req_resp = be16toh(f->req_resp);
+ result = be16toh(frame->result);
+ req_resp = be16toh(frame->req_resp);
if (req_resp & 0xf00)
req_resp = RPMB_RESP2REQ(req_resp);
fprintf(stderr, "--------------- %s ---------------\n",
title ? title : "start");
fprintf(stderr, "ptr: %p\n", f);
- dump_hex_buffer("key_mac: ", f->key_mac, 32);
- dump_hex_buffer("data: ", f->data, 256);
- dump_hex_buffer("nonce: ", f->nonce, 16);
- fprintf(stderr, "write_counter: %u\n", be32toh(f->write_counter));
- fprintf(stderr, "address: %0X\n", be16toh(f->addr));
- fprintf(stderr, "block_count: %u\n", be16toh(f->block_count));
+ dump_hex_buffer("key_mac: ", frame->key_mac, 32);
+ dump_hex_buffer("data: ", frame->data, 256);
+ dump_hex_buffer("nonce: ", frame->nonce, 16);
+ fprintf(stderr, "write_counter: %u\n", be32toh(frame->write_counter));
+ fprintf(stderr, "address: %0X\n", be16toh(frame->addr));
+ fprintf(stderr, "block_count: %u\n", be16toh(frame->block_count));
fprintf(stderr, "result %s:%d\n", rpmb_result_str(result), result);
fprintf(stderr, "req_resp %s\n", rpmb_op_str(req_resp));
fprintf(stderr, "--------------- End ---------------\n");
}
-static struct rpmb_frame_jdec *rpmb_alloc_frames(unsigned int cnt)
+static void dbg_dump_frame_nvme(const char *title, const void *f, uint32_t cnt)
+{
+ uint16_t result, req_resp;
+ uint32_t keysize = 4;
+ uint32_t sector_count;
+ const struct rpmb_frame_nvme *frame = f;
+
+ if (!verbose)
+ return;
+
+ if (!f)
+ return;
+
+ result = le16toh(frame->result);
+ req_resp = le16toh(frame->req_resp);
+ if (req_resp & 0xf00)
+ req_resp = RPMB_RESP2REQ(req_resp);
+
+ sector_count = le32toh(frame->block_count);
+
+ fprintf(stderr, "--------------- %s ---------------\n",
+ title ? title : "start");
+ fprintf(stderr, "ptr: %p\n", f);
+ dump_hex_buffer("key_mac: ", &frame->key_mac[223 - keysize], keysize);
+ dump_hex_buffer("nonce: ", frame->nonce, 16);
+ fprintf(stderr, "rpmb_target: %u\n", frame->rpmb_target);
+ fprintf(stderr, "write_counter: %u\n", le32toh(frame->write_counter));
+ fprintf(stderr, "address: %0X\n", le32toh(frame->addr));
+ fprintf(stderr, "block_count: %u\n", sector_count);
+ fprintf(stderr, "result %s:%d\n", rpmb_result_str(result), result);
+ fprintf(stderr, "req_resp %s\n", rpmb_op_str(req_resp));
+ dump_hex_buffer("data: ", frame->data, RPMB_SECTOR_SIZE * cnt);
+ fprintf(stderr, "--------------- End --------------\n");
+}
+
+static void dbg_dump_frame(uint8_t frame_type, const char *title,
+ const void *f, uint32_t cnt)
+{
+ if (frame_type == RPMB_FRAME_TYPE_NVME)
+ dbg_dump_frame_nvme(title, f, cnt);
+ else
+ dbg_dump_frame_jdec(title, f, cnt);
+}
+
+static int rpmb_frame_set_key_mac_jdec(void *f, uint32_t block_count,
+ uint8_t *key_mac, size_t key_mac_size)
+{
+ struct rpmb_frame_jdec *frames = f;
+
+ if (block_count == 0)
+ block_count = 1;
+
+ memcpy(&frames[block_count - 1].key_mac, key_mac, key_mac_size);
+
+ return 0;
+}
+
+static int rpmb_frame_set_key_mac_nvme(void *f, uint32_t block_count,
+ uint8_t *key_mac, size_t key_mac_size)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ memcpy(&frame->key_mac[223 - key_mac_size], key_mac, key_mac_size);
+
+ return 0;
+}
+
+static int rpmb_frame_set_key_mac(uint8_t frame_type, void *f,
+ uint32_t block_count,
+ uint8_t *key_mac, size_t key_mac_size)
+{
+ if (frame_type == RPMB_FRAME_TYPE_NVME)
+ return rpmb_frame_set_key_mac_nvme(f, block_count,
+ key_mac, key_mac_size);
+ else
+ return rpmb_frame_set_key_mac_jdec(f, block_count,
+ key_mac, key_mac_size);
+}
+
+static uint8_t *rpmb_frame_get_key_mac_ptr_jdec(void *f, uint32_t block_count,
+ size_t key_size)
{
- return calloc(1, rpmb_ioc_frames_len_jdec(cnt));
+ struct rpmb_frame_jdec *frame = f;
+
+ if (block_count == 0)
+ block_count = 1;
+
+ return frame[block_count - 1].key_mac;
+}
+
+static uint8_t *rpmb_frame_get_key_mac_ptr_nvme(void *f, uint32_t block_count,
+ size_t key_size)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return &frame->key_mac[223 - key_size];
+}
+
+static uint8_t *rpmb_frame_get_key_mac_ptr(uint8_t frame_type, void *f,
+ uint32_t block_count,
+ size_t key_size)
+{
+ if (frame_type == RPMB_FRAME_TYPE_NVME)
+ return rpmb_frame_get_key_mac_ptr_nvme(f, block_count,
+ key_size);
+ else
+ return rpmb_frame_get_key_mac_ptr_jdec(f, block_count,
+ key_size);
+}
+
+static uint8_t *rpmb_frame_get_nonce_ptr_jdec(void *f)
+{
+ struct rpmb_frame_jdec *frame = f;
+
+ return frame->nonce;
+}
+
+static uint8_t *rpmb_frame_get_nonce_ptr_nvme(void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return frame->nonce;
+}
+
+static uint8_t *rpmb_frame_get_nonce_ptr(uint8_t frame_type, void *f)
+{
+ return frame_type == RPMB_FRAME_TYPE_NVME ?
+ rpmb_frame_get_nonce_ptr_nvme(f) :
+ rpmb_frame_get_nonce_ptr_jdec(f);
+}
+
+static uint32_t rpmb_frame_get_write_counter_jdec(void *f)
+{
+ struct rpmb_frame_jdec *frame = f;
+
+ return be32toh(frame->write_counter);
+}
+
+static uint32_t rpmb_frame_get_write_counter_nvme(void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return le32toh(frame->write_counter);
+}
+
+static uint32_t rpmb_frame_get_write_counter(uint8_t frame_type, void *f)
+{
+ return (frame_type == RPMB_FRAME_TYPE_NVME) ?
+ rpmb_frame_get_write_counter_nvme(f) :
+ rpmb_frame_get_write_counter_jdec(f);
+}
+
+static uint32_t rpmb_frame_get_addr_jdec(void *f)
+{
+ struct rpmb_frame_jdec *frame = f;
+
+ return be16toh(frame->addr);
+}
+
+static uint32_t rpmb_frame_get_addr_nvme(void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return le32toh(frame->addr);
+}
+
+static uint32_t rpmb_frame_get_addr(uint8_t frame_type, void *f)
+{
+ return (frame_type == RPMB_FRAME_TYPE_NVME) ?
+ rpmb_frame_get_addr_nvme(f) :
+ rpmb_frame_get_addr_jdec(f);
+}
+
+static uint16_t rpmb_frame_get_result_jdec(void *f)
+{
+ struct rpmb_frame_jdec *frames = f;
+ uint16_t block_count = be16toh(frames[0].block_count);
+
+ if (block_count == 0)
+ block_count = 1;
+
+ return be16toh(frames[block_count - 1].result);
+}
+
+static uint16_t rpmb_frame_get_result_nvme(void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return le16toh(frame->result);
+}
+
+static uint16_t rpmb_frame_get_result(uint8_t frame_type, void *f)
+{
+ return (frame_type == RPMB_FRAME_TYPE_NVME) ?
+ rpmb_frame_get_result_nvme(f) :
+ rpmb_frame_get_result_jdec(f);
+}
+
+static uint16_t rpmb_frame_get_req_resp_jdec(void *f)
+{
+ struct rpmb_frame_jdec *frame = f;
+
+ return be16toh(frame->req_resp);
+}
+
+static uint16_t rpmb_frame_get_req_resp_nvme(void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ return le16toh(frame->req_resp);
+}
+
+static uint16_t rpmb_frame_get_req_resp(uint8_t frame_type, void *f)
+{
+ return frame_type == RPMB_FRAME_TYPE_NVME ?
+ rpmb_frame_get_req_resp_nvme(f) :
+ rpmb_frame_get_req_resp_jdec(f);
+}
+
+static int rpmb_frame_set_jdec(void *f,
+ uint16_t req_resp, uint32_t block_count,
+ uint32_t addr, uint32_t write_counter)
+{
+ struct rpmb_frame_jdec *frames = f;
+ uint32_t i;
+ /* FIMXE: validate overflow */
+ uint16_t __block_count = (uint16_t)block_count;
+ uint16_t __addr = (uint16_t)addr;
+
+ for (i = 0; i < (block_count ?: 1); i++) {
+ frames[i].req_resp = htobe16(req_resp);
+ frames[i].block_count = htobe16(__block_count);
+ frames[i].addr = htobe16(__addr);
+ frames[i].write_counter = htobe32(write_counter);
+ }
+
+ return 0;
+}
+
+static int rpmb_frame_set_nvme(void *f,
+ uint16_t req_resp, uint32_t block_count,
+ uint32_t addr, uint32_t write_counter)
+{
+ struct rpmb_frame_nvme *frame = f;
+
+ frame->req_resp = htole16(req_resp);
+ frame->block_count = htole32(block_count);
+ frame->addr = htole32(addr);
+ frame->write_counter = htole32(write_counter);
+
+ return 0;
+}
+
+static int rpmb_frame_set(uint8_t frame_type, void *f,
+ uint16_t req_resp, uint32_t block_count,
+ uint32_t addr, uint32_t write_counter)
+{
+ if (frame_type == RPMB_FRAME_TYPE_NVME) {
+ return rpmb_frame_set_nvme(f, req_resp, block_count,
+ addr, write_counter);
+ } else {
+ return rpmb_frame_set_jdec(f, req_resp, block_count,
+ addr, write_counter);
+ }
+}
+
+static int rpmb_frame_write_data_jdec(int fd, void *f)
+{
+ struct rpmb_frame_jdec *frames = f;
+ uint16_t i, block_count = be16toh(frames[0].block_count);
+
+ for (i = 0; i < block_count; i++) {
+ int ret;
+
+ ret = write_file(fd, frames[i].data, sizeof(frames[i].data));
+ if (ret < 0)
+ return ret;
+ }
+ return 0;
+}
+
+static int rpmb_frame_write_data_nvme(int fd, void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+ uint32_t i, block_count = le32toh(frame->block_count);
+
+ for (i = 0; i < block_count; i++) {
+ int ret;
+
+ ret = write_file(fd, &frame->data[i], RPMB_SECTOR_SIZE);
+ if (ret < 0)
+ return ret;
+ }
+ return 0;
+}
+
+static int rpmb_frame_write_data(uint8_t frame_type, int fd, void *f)
+{
+ return frame_type == RPMB_FRAME_TYPE_NVME ?
+ rpmb_frame_write_data_nvme(fd, f) :
+ rpmb_frame_write_data_jdec(fd, f);
+}
+
+static int rpmb_frame_read_data_jdec(int fd, void *f)
+{
+ struct rpmb_frame_jdec *frames = f;
+ uint16_t i, block_count = be16toh(frames[0].block_count);
+
+ for (i = 0; i < block_count; i++) {
+ int ret = read_file(fd, frames[i].data,
+ sizeof(frames[0].data));
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int rpmb_frame_read_data_nvme(int fd, void *f)
+{
+ struct rpmb_frame_nvme *frame = f;
+ uint32_t i, block_count = le32toh(frame->block_count);
+
+ for (i = 0; i < block_count; i++) {
+ int ret;
+
+ ret = read_file(fd, &frame->data[i], RPMB_SECTOR_SIZE);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int rpmb_frame_read_data(uint8_t frame_type, int fd, void *f)
+{
+ return frame_type == RPMB_FRAME_TYPE_NVME ?
+ rpmb_frame_read_data_nvme(fd, f) :
+ rpmb_frame_read_data_jdec(fd, f);
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
-static int rpmb_calc_hmac_sha256(struct rpmb_frame_jdec *frames,
- size_t blocks_cnt,
- const unsigned char key[],
- unsigned int key_size,
- unsigned char mac[],
- unsigned int mac_size)
+static int rpmb_calc_hmac_sha256_jdec(struct rpmb_frame_jdec *frames,
+ size_t blocks_cnt,
+ const unsigned char key[],
+ unsigned int key_size,
+ unsigned char mac[],
+ unsigned int mac_size)
+{
+ HMAC_CTX ctx;
+ int ret;
+ unsigned int i;
+
+ /* SSL returns 1 on success 0 on failure */
+
+ HMAC_CTX_init(&ctx);
+ ret = HMAC_Init_ex(&ctx, key, key_size, EVP_sha256(), NULL);
+ if (ret == 0)
+ goto out;
+ for (i = 0; i < block_count; i++)
+ HMAC_Update(&ctx, frames[i].data, rpmb_jdec_hmac_data_len);
+
+ ret = HMAC_Final(&ctx, mac, &mac_size);
+ if (ret == 0)
+ goto out;
+ if (mac_size != RPMB_MAC_SIZE)
+ ret = 0;
+
+ ret = 1;
+out:
+ HMAC_CTX_cleanup(&ctx);
+ return ret == 1 ? 0 : -1;
+}
+
+static int rpmb_calc_hmac_sha256_nvme(struct rpmb_frame_nvme *frame,
+ size_t block_count,
+ const unsigned char key[],
+ unsigned int key_size,
+ unsigned char mac[],
+ unsigned int mac_size)
{
HMAC_CTX ctx;
int ret;
@@ -291,8 +665,10 @@ static int rpmb_calc_hmac_sha256(struct rpmb_frame_jdec *frames,
ret = HMAC_Init_ex(&ctx, key, key_size, EVP_sha256(), NULL);
if (ret == 0)
goto out;
- for (i = 0; i < blocks_cnt; i++)
- HMAC_Update(&ctx, frames[i].data, hmac_data_len);
+
+ HMAC_Update(&ctx, &frame->rpmb_target, hmac_nvme_data_len);
+ for (i = 0; i < block_count; i++)
+ HMAC_Update(&ctx, frames->data[i], RPMB_SECTOR_SIZE);
ret = HMAC_Final(&ctx, mac, &mac_size);
if (ret == 0)
@@ -306,12 +682,12 @@ static int rpmb_calc_hmac_sha256(struct rpmb_frame_jdec *frames,
return ret == 1 ? 0 : -1;
}
#else
-static int rpmb_calc_hmac_sha256(struct rpmb_frame_jdec *frames,
- size_t blocks_cnt,
- const unsigned char key[],
- unsigned int key_size,
- unsigned char mac[],
- unsigned int mac_size)
+static int rpmb_calc_hmac_sha256_jdec(struct rpmb_frame_jdec *frames,
+ size_t blocks_cnt,
+ const unsigned char key[],
+ unsigned int key_size,
+ unsigned char mac[],
+ unsigned int mac_size)
{
HMAC_CTX *ctx;
int ret;
@@ -338,37 +714,83 @@ static int rpmb_calc_hmac_sha256(struct rpmb_frame_jdec *frames,
HMAC_CTX_free(ctx);
return ret == 1 ? 0 : -1;
}
+
+static int rpmb_calc_hmac_sha256_nvme(struct rpmb_frame_nvme *frame,
+ size_t block_count,
+ const unsigned char key[],
+ unsigned int key_size,
+ unsigned char mac[],
+ unsigned int mac_size)
+{
+ HMAC_CTX *ctx;
+ int ret;
+ unsigned int i;
+
+ /* SSL returns 1 on success 0 on failure */
+
+ ctx = HMAC_CTX_new();
+
+ ret = HMAC_Init_ex(ctx, key, key_size, EVP_sha256(), NULL);
+ if (ret == 0)
+ goto out;
+
+ HMAC_Update(ctx, &frame->rpmb_target, rpmb_nvme_hmac_data_len);
+ for (i = 0; i < block_count; i++)
+ HMAC_Update(ctx, &frame->data[i], RPMB_SECTOR_SIZE);
+
+ ret = HMAC_Final(ctx, mac, &mac_size);
+ if (ret == 0)
+ goto out;
+ if (mac_size != RPMB_MAC_SIZE)
+ ret = 0;
+
+ ret = 1;
+out:
+ HMAC_CTX_free(ctx);
+ return ret == 1 ? 0 : -1;
+}
#endif
-static int rpmb_check_req_resp(uint16_t req, struct rpmb_frame_jdec *frame_out)
+static int rpmb_calc_hmac_sha256(uint8_t frame_type, void *f,
+ size_t block_count,
+ const unsigned char key[],
+ unsigned int key_size,
+ unsigned char mac[],
+ unsigned int mac_size)
{
- if (RPMB_REQ2RESP(req) != be16toh(frame_out->req_resp)) {
- rpmb_err("RPMB response mismatch %04X != %04X\n.",
- RPMB_REQ2RESP(req), be16toh(frame_out->req_resp));
- return -1;
- }
- return 0;
+ if (frame_type == RPMB_FRAME_TYPE_NVME)
+ return rpmb_calc_hmac_sha256_nvme(f, block_count,
+ key, key_size,
+ mac, mac_size);
+ else
+ return rpmb_calc_hmac_sha256_jdec(f, block_count,
+ key, key_size,
+ mac, mac_size);
}
-static int rpmb_check_mac(const unsigned char *key,
- struct rpmb_frame_jdec *frames_out,
- unsigned int cnt_out)
+static int rpmb_check_mac(uint8_t frame_type,
+ const unsigned char *key, size_t key_size,
+ void *frames_out, unsigned int block_count)
{
unsigned char mac[RPMB_MAC_SIZE];
+ unsigned char *mac_out;
+ int ret;
- if (cnt_out == 0) {
+ if (block_count == 0) {
rpmb_err("RPMB 0 output frames.\n");
return -1;
}
- rpmb_calc_hmac_sha256(frames_out, cnt_out,
- key, RPMB_KEY_SIZE,
- mac, RPMB_MAC_SIZE);
+ ret = rpmb_calc_hmac_sha256(frame_type, frames_out, block_count,
+ key, key_size, mac, RPMB_MAC_SIZE);
+ if (ret)
+ return ret;
- if (memcmp(mac, frames_out[cnt_out - 1].key_mac, RPMB_MAC_SIZE)) {
+ mac_out = rpmb_frame_get_key_mac_ptr(frame_type, frames_out,
+ block_count, RPMB_MAC_SIZE);
+ if (memcmp(mac, mac_out, RPMB_MAC_SIZE)) {
rpmb_err("RPMB hmac mismatch:\n");
- dump_hex_buffer("Result MAC: ",
- frames_out[cnt_out - 1].key_mac, RPMB_MAC_SIZE);
+ dump_hex_buffer("Result MAC: ", mac_out, RPMB_MAC_SIZE);
dump_hex_buffer("Expected MAC: ", mac, RPMB_MAC_SIZE);
return -1;
}
@@ -376,23 +798,54 @@ static int rpmb_check_mac(const unsigned char *key,
return 0;
}
-static int rpmb_ioctl(int fd, uint16_t req,
- const struct rpmb_frame_jdec *frames_in,
- unsigned int cnt_in,
- struct rpmb_frame_jdec *frames_out,
- unsigned int cnt_out)
+static int rpmb_check_req_resp(uint8_t frame_type,
+ uint16_t req, void *frame_out)
+{
+ uint16_t req_resp = rpmb_frame_get_req_resp(frame_type, frame_out);
+
+ if (RPMB_REQ2RESP(req) != req_resp) {
+ rpmb_err("RPMB response mismatch %04X != %04X\n.",
+ RPMB_REQ2RESP(req), req_resp);
+ return -1;
+ }
+
+ return 0;
+}
+
+static struct rpmb_frame_jdec *rpmb_frame_alloc_jdec(size_t block_count)
+{
+ return calloc(1, rpmb_ioc_frames_len_jdec(block_count));
+}
+
+static struct rpmb_frame_nvme *rpmb_frame_alloc_nvme(size_t sector_count)
+{
+ return calloc(1, rpmb_ioc_frames_len_nvme(sector_count));
+}
+
+static void *rpmb_frame_alloc(uint8_t type, size_t count)
+{
+ if (type == RPMB_FRAME_TYPE_NVME)
+ return rpmb_frame_alloc_nvme(count);
+ else
+ return rpmb_frame_alloc_jdec(count);
+}
+
+static int rpmb_ioctl(uint8_t frame_type, int fd, uint16_t req,
+ const void *frames_in, unsigned int cnt_in,
+ void *frames_out, unsigned int cnt_out)
{
int ret;
struct __attribute__((packed)) {
struct rpmb_ioc_seq_cmd h;
struct rpmb_ioc_cmd cmd[3];
} iseq = {};
- struct rpmb_frame_jdec *frame_res = NULL;
+
+ void *frame_res = NULL;
int i;
uint32_t flags;
rpmb_dbg("RPMB OP: %s\n", rpmb_op_str(req));
- dbg_dump_frame("In Frame: ", frames_in);
+ dbg_dump_frame(frame_type, "In Frame: ", frames_in, cnt_in);
i = 0;
flags = RPMB_F_WRITE;
@@ -402,10 +855,11 @@ static int rpmb_ioctl(int fd, uint16_t req,
i++;
if (req == RPMB_WRITE_DATA || req == RPMB_PROGRAM_KEY) {
- frame_res = rpmb_alloc_frames(0);
+ frame_res = rpmb_frame_alloc(frame_type, 0);
if (!frame_res)
return -ENOMEM;
- frame_res->req_resp = htobe16(RPMB_RESULT_READ);
+ rpmb_frame_set(frame_type, frame_res,
+ RPMB_RESULT_READ, 0, 0, 0);
rpmb_ioc_cmd_set(iseq.cmd[i], RPMB_F_WRITE, frame_res, 0);
i++;
}
@@ -418,10 +872,10 @@ static int rpmb_ioctl(int fd, uint16_t req,
if (ret < 0)
rpmb_err("ioctl failure %d: %s.\n", ret, strerror(errno));
- ret = rpmb_check_req_resp(req, frames_out);
+ ret = rpmb_check_req_resp(frame_type, req, frames_out);
- dbg_dump_frame("Res Frame: ", frame_res);
- dbg_dump_frame("Out Frame: ", frames_out);
+ dbg_dump_frame(frame_type, "Res Frame: ", frame_res, 1);
+ dbg_dump_frame(frame_type, "Out Frame: ", frames_out, cnt_out);
free(frame_res);
return ret;
}
@@ -453,13 +907,61 @@ static int op_get_info(int nargs, char *argv[])
return 0;
}
+static int __rpmb_program_key(uint8_t frame_type, int dev_fd,
+ uint8_t *key, size_t key_size)
+{
+ void *frame_in, *frame_out;
+ uint16_t req = RPMB_PROGRAM_KEY;
+ int ret;
+
+ frame_in = rpmb_frame_alloc(frame_type, 0);
+ frame_out = rpmb_frame_alloc(frame_type, 0);
+ if (!frame_in || !frame_out) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ rpmb_frame_set(frame_type, frame_in, req, 0, 0, 0);
+
+ ret = rpmb_frame_set_key_mac(frame_type, frame_in, 0, key, key_size);
+ if (ret)
+ goto out;
+
+ ret = rpmb_ioctl(frame_type, dev_fd, req, frame_in, 1, frame_out, 1);
+ if (ret)
+ goto out;
+
+ ret = rpmb_check_req_resp(frame_type, req, frame_out);
+ if (ret)
+ goto out;
+
+ ret = rpmb_frame_get_result(frame_type, frame_out);
+ if (ret)
+ rpmb_err("RPMB operation %s failed, %s[0x%04x].\n",
+ rpmb_op_str(req), rpmb_result_str(ret), ret);
+
+out:
+ free(frame_in);
+ free(frame_out);
+
+ return 0;
+}
+
+static uint8_t rpmb_cap_get_frame_type(struct rpmb_ioc_cap_cmd *cap)
+{
+ if (cap->device_type == RPMB_TYPE_NVME)
+ return RPMB_FRAME_TYPE_NVME;
+ else
+ return RPMB_FRAME_TYPE_JDEC;
+}
+
static int op_rpmb_program_key(int nargs, char *argv[])
{
int ret;
int dev_fd = -1, key_fd = -1;
- uint16_t req = RPMB_PROGRAM_KEY;
+ uint8_t key[RPMB_KEY_SIZE];
+ uint8_t frame_type;
struct rpmb_ioc_cap_cmd cap;
- struct rpmb_frame_jdec *frame_in = NULL, *frame_out = NULL;
ret = -EINVAL;
if (nargs != 2)
@@ -475,87 +977,73 @@ static int op_rpmb_program_key(int nargs, char *argv[])
goto out;
argv++;
- frame_in = rpmb_alloc_frames(0);
- frame_out = rpmb_alloc_frames(0);
- if (!frame_in || !frame_out) {
- ret = -ENOMEM;
- goto out;
- }
+ read_file(key_fd, key, RPMB_KEY_SIZE);
- frame_in->req_resp = htobe16(req);
+ frame_type = rpmb_cap_get_frame_type(&cap);
- read_file(key_fd, frame_in->key_mac, RPMB_KEY_SIZE);
-
- ret = rpmb_ioctl(dev_fd, req, frame_in, 0, frame_out, 0);
- if (ret)
- goto out;
-
- if (RPMB_REQ2RESP(req) != be16toh(frame_out->req_resp)) {
- rpmb_err("RPMB response mismatch.\n");
- ret = -1;
- goto out;
- }
-
- ret = be16toh(frame_out->result);
- if (ret)
- rpmb_err("RPMB operation %s failed, %s[0x%04x].\n",
- rpmb_op_str(req), rpmb_result_str(ret), ret);
+ ret = __rpmb_program_key(frame_type, dev_fd, key, RPMB_KEY_SIZE);
out:
- free(frame_in);
- free(frame_out);
close_fd(dev_fd);
close_fd(key_fd);
return ret;
}
-static int rpmb_get_write_counter(int dev_fd, unsigned int *cnt,
- const unsigned char *key)
+static int rpmb_get_write_counter(uint8_t frame_type, int dev_fd,
+ unsigned int *cnt, const unsigned char *key)
{
int ret;
uint16_t res = 0x000F;
uint16_t req = RPMB_GET_WRITE_COUNTER;
- struct rpmb_frame_jdec *frame_in = NULL;
- struct rpmb_frame_jdec *frame_out = NULL;
+ void *frame_in = NULL;
+ void *frame_out = NULL;
+ uint8_t *nonce_in;
+ uint8_t *nonce_out;
- frame_in = rpmb_alloc_frames(0);
- frame_out = rpmb_alloc_frames(0);
+ frame_in = rpmb_frame_alloc(frame_type, 0);
+ frame_out = rpmb_frame_alloc(frame_type, 0);
if (!frame_in || !frame_out) {
ret = -ENOMEM;
goto out;
}
- frame_in->req_resp = htobe16(req);
- RAND_bytes(frame_in->nonce, RPMB_NONCE_SIZE);
+ rpmb_frame_set(frame_type, frame_in, req, 0, 0, 0);
+ nonce_in = rpmb_frame_get_nonce_ptr(frame_type, frame_in);
+ RAND_bytes(nonce_in, RPMB_NONCE_SIZE);
- ret = rpmb_ioctl(dev_fd, req, frame_in, 0, frame_out, 0);
+ ret = rpmb_ioctl(frame_type, dev_fd, req, frame_in, 0, frame_out, 0);
if (ret)
goto out;
- res = be16toh(frame_out->result);
+ ret = rpmb_check_req_resp(frame_type, req, frame_out);
+ if (ret)
+ goto out;
+
+ res = rpmb_frame_get_result(frame_type, frame_out);
if (res != RPMB_ERR_OK) {
ret = -1;
goto out;
}
- if (memcmp(&frame_in->nonce, &frame_out->nonce, RPMB_NONCE_SIZE)) {
+ nonce_out = rpmb_frame_get_nonce_ptr(frame_type, frame_out);
+
+ if (memcmp(nonce_in, nonce_out, RPMB_NONCE_SIZE)) {
rpmb_err("RPMB NONCE mismatch\n");
- dump_hex_buffer("Result NONCE:",
- &frame_out->nonce, RPMB_NONCE_SIZE);
- dump_hex_buffer("Expected NONCE: ",
- &frame_in->nonce, RPMB_NONCE_SIZE);
+ dump_hex_buffer("Result NONCE:", nonce_out, RPMB_NONCE_SIZE);
+ dump_hex_buffer("Expected NONCE: ", nonce_in, RPMB_NONCE_SIZE);
ret = -1;
goto out;
}
if (key) {
- ret = rpmb_check_mac(key, frame_out, 1);
+ ret = rpmb_check_mac(frame_type, key, RPMB_KEY_SIZE,
+ frame_out, 1);
if (ret)
goto out;
}
- *cnt = be32toh(frame_out->write_counter);
+ *cnt = rpmb_frame_get_write_counter(frame_type, frame_out);
out:
if (ret)
@@ -573,7 +1061,8 @@ static int op_rpmb_get_write_counter(int nargs, char **argv)
bool has_key;
struct rpmb_ioc_cap_cmd cap;
unsigned char key[RPMB_KEY_SIZE];
- unsigned int cnt;
+ unsigned int cnt = 0;
+ uint8_t frame_type;
if (nargs == 2)
has_key = true;
@@ -588,6 +1077,8 @@ static int op_rpmb_get_write_counter(int nargs, char **argv)
return ret;
argv++;
+ frame_type = rpmb_cap_get_frame_type(&cap);
+
if (has_key) {
key_fd = open_rd_file(argv[0], "key file");
if (key_fd < 0)
@@ -598,9 +1089,9 @@ static int op_rpmb_get_write_counter(int nargs, char **argv)
if (ret < 0)
goto out;
- ret = rpmb_get_write_counter(dev_fd, &cnt, key);
+ ret = rpmb_get_write_counter(frame_type, dev_fd, &cnt, key);
} else {
- ret = rpmb_get_write_counter(dev_fd, &cnt, NULL);
+ ret = rpmb_get_write_counter(frame_type, dev_fd, &cnt, NULL);
}
if (!ret)
@@ -614,17 +1105,18 @@ static int op_rpmb_get_write_counter(int nargs, char **argv)
static int op_rpmb_read_blocks(int nargs, char **argv)
{
- int i, ret;
+ int ret;
int dev_fd = -1, data_fd = -1, key_fd = -1;
uint16_t req = RPMB_READ_DATA;
- uint16_t addr, blocks_cnt;
+ uint32_t addr, block_count;
unsigned char key[RPMB_KEY_SIZE];
+ uint8_t *nonce_in;
unsigned long numarg;
bool has_key;
struct rpmb_ioc_cap_cmd cap;
- struct rpmb_frame_jdec *frame_in = NULL;
- struct rpmb_frame_jdec *frames_out = NULL;
- struct rpmb_frame_jdec *frame_out;
+ void *frame_in = NULL;
+ void *frames_out = NULL;
+ uint8_t frame_type;
ret = -EINVAL;
if (nargs == 4)
@@ -641,23 +1133,23 @@ static int op_rpmb_read_blocks(int nargs, char **argv)
errno = 0;
numarg = strtoul(argv[0], NULL, 0);
- if (errno || numarg > USHRT_MAX) {
+ if (errno || numarg > UINT_MAX) {
rpmb_err("wrong block address\n");
goto out;
}
- addr = (uint16_t)numarg;
+ addr = (uint32_t)numarg;
argv++;
errno = 0;
numarg = strtoul(argv[0], NULL, 0);
- if (errno || numarg > USHRT_MAX) {
+ if (errno || numarg > UINT_MAX) {
rpmb_err("wrong blocks count\n");
goto out;
}
- blocks_cnt = (uint16_t)numarg;
+ block_count = (uint32_t)numarg;
argv++;
- if (blocks_cnt == 0) {
+ if (block_count == 0) {
rpmb_err("wrong blocks count\n");
goto out;
}
@@ -678,27 +1170,30 @@ static int op_rpmb_read_blocks(int nargs, char **argv)
goto out;
}
+ frame_type = rpmb_cap_get_frame_type(&cap);
+
ret = 0;
- frames_out = rpmb_alloc_frames(blocks_cnt);
- frame_in = rpmb_alloc_frames(0);
+ frames_out = rpmb_frame_alloc(frame_type, block_count);
+ frame_in = rpmb_frame_alloc(frame_type, 0);
if (!frames_out || !frame_in) {
- rpmb_err("Cannot allocate %d RPMB frames\n", blocks_cnt);
+ rpmb_err("Cannot allocate %d RPMB frames\n", block_count);
ret = -ENOMEM;
goto out;
}
- frame_in->req_resp = htobe16(req);
- frame_in->addr = htobe16(addr);
- /* eMMc spec ask for 0 here this will be translated by the rpmb layer */
- frame_in->block_count = htobe16(blocks_cnt);
- RAND_bytes(frame_in->nonce, RPMB_NONCE_SIZE);
+ /* eMMc spec ask for 0 block_count here
+ * this will be translated by the rpmb layer
+ */
+ rpmb_frame_set(frame_type, frame_in, req, block_count, addr, 0);
+ nonce_in = rpmb_frame_get_nonce_ptr(frame_type, frame_in);
+ RAND_bytes(nonce_in, RPMB_NONCE_SIZE);
- ret = rpmb_ioctl(dev_fd, req, frame_in, 0, frames_out, blocks_cnt);
+ ret = rpmb_ioctl(frame_type, dev_fd, req, frame_in, 0,
+ frames_out, block_count);
if (ret)
goto out;
- frame_out = &frames_out[blocks_cnt - 1];
- ret = be16toh(frame_out->result);
+ ret = rpmb_frame_get_result(frame_type, frames_out);
if (ret) {
rpmb_err("RPMB operation %s failed, %s[0x%04x]\n",
rpmb_op_str(req), rpmb_result_str(ret), ret);
@@ -706,17 +1201,13 @@ static int op_rpmb_read_blocks(int nargs, char **argv)
}
if (has_key) {
- ret = rpmb_check_mac(key, frames_out, blocks_cnt);
+ ret = rpmb_check_mac(frame_type, key, RPMB_KEY_SIZE,
+ frames_out, block_count);
if (ret)
goto out;
}