Commit 251a72e9 authored by Aki Braun's avatar Aki Braun
Browse files

[CIS 49] clarify factory reset

parent 7f86ffb8

EN-304-620.md

+4 −6
Original line number Diff line number Diff line
@@ -1214,8 +1214,8 @@ Requirements that mitigate this threat: AUTH, REQ-CON-15 (MI-CDST), SCDL, REQ-DR 


Mitigations for Likelihood:



* Medium to Low: (REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)), REQ-DRT-04 (MI-SDRF), REQ-DRT-05 (MI-SDTR)

* High to Low: (REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)), REQ-DRT-04 (MI-SDRF), REQ-DRT-05 (MI-SDTR)

* Medium to Low: REQ-DRT-02 (MI-RSET), REQ-DRT-03 (MI-INST), REQ-DRT-04 (MI-SDRF), REQ-DRT-05 (MI-SDTR)

* High to Low: REQ-DRT-02 (MI-RSET), REQ-DRT-03 (MI-INST), REQ-DRT-04 (MI-SDRF), REQ-DRT-05 (MI-SDTR)



Mitigations for Impact:
@@ -1438,18 +1438,16 @@ _Editor's note: this table must be updated before the draft can be considered Fi 
|  REQ-LOG-02 (MI-LOGG-1) |  x   |  x   |  x   |  x   |  x   |  x   |  x   |

|  REQ-LOG-03 (MI-LOGG-2) |      |      |      |  x   |  x   |      |      |

|  REQ-LOG-04 (MI-LOGG-3) |      |  x   |  x   |      |      |      |      |

|    REQ-DRT-02 (MI-RSET) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |

|    REQ-DRT-03 (MI-INST) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |

|    REQ-DRT-02 (MI-RSET) |  x   |  x   |  x   |  x   |  x   |  x   |  x   |

|    REQ-DRT-03 (MI-INST) |  x   |  x   |  x   |  x   |      |      |      |

|    REQ-DRT-04 (MI-SDRF) |      |      |  x   |  x   |  x   |  x   |  x   |

|    REQ-DRT-05 (MI-SDTR) |      |  x   |      |  x   |  x   |  x   |      |

|    REQ-DRT-06 (MI-DELE) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |



¹ REQ-SSD-03 (MI-FZ95) or REQ-SSD-04 (MI-BTIN) or REQ-SSD-05 (MI-IMSL) apply  

² REQ-SU-02 (MI-KEVD) or REQ-SU-03 (MI-KEVA) apply  

³ REQ-SU-05 (MI-SUVP) or REQ-SU-06 (MI-SUAP) or REQ-SU-08 (MI-SUOE) or REQ-SU-09 (MI-SUAO) apply  

⁴ REQ-SU-06 (MI-SUAP) or REQ-SU-09 (MI-SUAO) apply  

⁵ REQ-EMM-02 (MI-NUTI-1) or (REQ-EMM-03 (MI-TRAF-2) and REQ-EMM-04 (MI-TRAF-3) and REQ-EMM-05 (MI-TRAF-4)) apply  

⁶ REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE) apply



# Annex G (informative): Guidelines on the implementation of the present document <span id="_annex.g"></span>

clauses/5.Requirements.md

+20 −38
Original line number Diff line number Diff line
@@ -1645,41 +1645,42 @@ VPNs are expected to provide the ability to securely delete data and settings, a 


> NOTE: Overwriting all user-writable storage or encrypting all user data and deleting the key are two secure deletion mechanisms.



### 5.15.2 REQ-DRT-02 (MI-RSET) Secure deletion via reset

### 5.15.2 REQ-DRT-02 (MI-RSET) Secure deletion via “factory reset”



#### 5.15.2.1 Requirement



The product shall provide a command to remove all data and settings and restore to its secure-by-default state.

* **REQ-DRT-02 (MI-RSET)-1** The product shall provide a secure deletion or “factory reset” functionality, and

* **REQ-DRT-02 (MI-RSET)-2** the product shall remove all data and settings and reset to its secure-by-default state after the secure deletion or “factory reset” functionality is used.



#### 5.15.2.2 Applicability



This requirement applies to products with the capability for the user to write data and/or settings that fall within the following use cases



* UC-1: not required

* UC-2: not required

* UC-3: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-4: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-5: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-6: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-7: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-1: required

* UC-2: required

* UC-3: required

* UC-4: required

* UC-5: required

* UC-6: required

* UC-7: required



### 5.15.3 REQ-DRT-03 (MI-INST) Secure deletion via reinstallation



#### 5.15.3.1 Requirement



The product shall support the ability to reset to its secure-by-default state after a reinstallation that securely deletes all previous user data or settings.

The product shall provide an option to restore its secure-by-default state during reinstallation that securely deletes all previous user data or settings.



#### 5.15.3.2 Applicability



This requirement applies to products with the capability for the user to write data and/or settings that fall within the following use cases



* UC-1: not required

* UC-2: not required

* UC-3: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-4: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-5: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-6: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-7: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-1: required

* UC-2: required

* UC-3: required

* UC-4: required

* UC-5: not required

* UC-6: not required

* UC-7: not required



### 5.15.4 REQ-DRT-04 (MI-SDRF) Secure data read from product
@@ -1722,30 +1723,11 @@ Of the above described products, this requirement applies to products that fall 
* UC-6: required

* UC-7: not required



### 5.15.6 REQ-DRT-06 (MI-DELE) Secure deletion via secure deletion function



#### 5.15.6.1 Requirement



The product shall reset to its secure-by-default state after the secure deletion functionality is used.



#### 5.15.6.2 Applicability



* UC-1: not required

* UC-2: not required

* UC-3: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-4: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-5: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-6: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)

* UC-7: REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE)



### 5.15.N Mapping of requirements to use cases



|         Requirements | UC-1 | UC-2 | UC-3 | UC-4 | UC-5 | UC-6 | UC-7 |

|---------------------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|

| REQ-DRT-02 (MI-RSET) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |

| REQ-DRT-03 (MI-INST) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |

| REQ-DRT-02 (MI-RSET) |  x   |  x   |  x   |  x   |  x   |  x   |  x   |

| REQ-DRT-03 (MI-INST) |  x   |  x   |  x   |  x   |      |      |      |

| REQ-DRT-04 (MI-SDRF) |      |      |  x   |  x   |  x   |  x   |  x   |

| REQ-DRT-05 (MI-SDTR) |      |  x   |      |  x   |  x   |  x   |      |
 
| REQ-DRT-06 (MI-DELE) |      |      |  x⁶  |  x⁶  |  x⁶  |  x⁶  |  x⁶  |



⁶ REQ-DRT-02 (MI-RSET) or REQ-DRT-03 (MI-INST) or REQ-DRT-06 (MI-DELE) apply

clauses/6.Assessment-Criteria.md

+2 −37
Original line number Diff line number Diff line
@@ -2208,7 +2208,7 @@ Otherwise FAIL 


This clause provides assessment for the requirements in 5.15 relating to CRA [\[i.1\]](#_ref_i.1) Annex 1 Part 1 (2) (m).



### 6.15.2 REQ-DRT-02 (MI-RSET) Secure deletion via reset

### 6.15.2 REQ-DRT-02 (MI-RSET) Secure deletion via "factory reset"



#### 6.15.2.1 Objective
@@ -2225,7 +2225,7 @@ For each type of user data or setting that may be stored and changed by the user 
1. write an instance of the data or setting stored on the product that is different from the default, and

2. read it from the product.



Once all types of data have been written and read, invoke the command to revoke all data and settings and read each type of data again.

Once all types of data have been written and read, invoke the “factory reset” or equivalent command to revoke all data and settings and read each type of data again.



#### 6.15.2.4 Verdict
@@ -2342,38 +2342,3 @@ Otherwise FAIL 
* List of exported data and settings

* Log messages from the export in direct response to user action

* Exported configuration reflecting accurate representation of product settings
 


### 6.15.6 REQ-DRT-06 (MI-DELE) Secure deletion via secure deletion function



#### 6.15.6.1 Objective



Secure deletion



#### 6.15.6.2 Preparation



Document every type of data or setting that may be stored and changed by the user on the product, how to store it on the product, and how to read it from the product.



#### 6.15.6.3 Activities



For each type of user data or setting that may be stored and changed by the user on the product:



1. write an instance of the data or setting stored on the product that is different from the default, and

2. read it from the product.



Once all types of data have been written and read, activate the secure deletion function, and read the data or settings again.



#### 6.15.6.4 Verdict



PASS if **all** of the following are fulfilled:



* No configured data is the same for both of the reads.



Otherwise FAIL



#### 6.15.6.5 Evidence



* Record of each type of data or setting

* What data or setting was written

* What data or setting was returned by the first read

* What data or setting was returned by the second read

* Comparison of the two reads