diff --git a/certmanager/src/main/ets/@ohos.security.certManager.d.ts b/certmanager/src/main/ets/@ohos.security.certManager.d.ts index c3b6d48b1c5cea93b2650900b5b56f3d04d52318..bc6fa8d8967f745123123a43b2e58d8bcd563f8e 100755 --- a/certmanager/src/main/ets/@ohos.security.certManager.d.ts +++ b/certmanager/src/main/ets/@ohos.security.certManager.d.ts @@ -148,21 +148,9 @@ declare namespace CertManagerFunc { keyUri: string; } - export enum CertFileFormat { - PEM_DER = 0, - P7B = 1, - } - - export enum CertScope { - CURRENT_USER = 1, - GLOBAL_USER = 2 - } - export interface CertBlob { inData: Uint8Array; alias: string; - certFormat? : CertFileFormat; - certScope? : CertScope; } export interface CMResult { diff --git a/certmanager/src/main/ets/MainAbility/CertPickerUiExtAbility.ets b/certmanager/src/main/ets/MainAbility/CertPickerUiExtAbility.ets index e6dc8d79e1a7f3b4eac4ab1a74a2f468772b7be8..3200a81344124e844d34b15c33df3bd94817343a 100755 --- a/certmanager/src/main/ets/MainAbility/CertPickerUiExtAbility.ets +++ b/certmanager/src/main/ets/MainAbility/CertPickerUiExtAbility.ets @@ -67,7 +67,7 @@ export default class CertPickerUiExtAbility extends UIExtensionAbility { } private isStartToInstall(parameters: Record | undefined): boolean { - if (parameters === undefined) { + if(parameters === undefined) { return false; } return parameters['pageType'] === PAGE_CA_INSTALL; diff --git a/certmanager/src/main/ets/MainAbility/MainExtensionAbility.ts b/certmanager/src/main/ets/MainAbility/MainExtensionAbility.ts index f008ac210104982243efd7b434261b2ebedd2415..81f58b6429df5de657f2e95c9492780c35a55c3c 100755 --- a/certmanager/src/main/ets/MainAbility/MainExtensionAbility.ts +++ b/certmanager/src/main/ets/MainAbility/MainExtensionAbility.ts @@ -37,7 +37,7 @@ export default class MainExtensionAbility extends UIExtensionAbility { let param: Record = { 'session': session, 'want': want - }; + } let storage: LocalStorage = new LocalStorage(param); let pullType: string = want.parameters.pullType as string; diff --git a/certmanager/src/main/ets/common/constants/FileFilterParams.ets b/certmanager/src/main/ets/common/constants/FileFilterParams.ets index caab03a7b7839a86bbc40da1df2b2396d4b5bfa6..5e601eee84b45b6b775e7b51bf2cd4387d02632a 100755 --- a/certmanager/src/main/ets/common/constants/FileFilterParams.ets +++ b/certmanager/src/main/ets/common/constants/FileFilterParams.ets @@ -15,6 +15,6 @@ export default class FilterParams { public static readonly MAX_SELECT_FILE_NUM = 1; - public static readonly CERT_FILE_SUFFIX = ['.pem,.cer,.crt,.der,.p7b,.spc']; + public static readonly CERT_FILE_SUFFIX = ['.pem,.cer,.crt,.der']; public static readonly CREDENTIAL_FILE_SUFFIX = ['.pfx,.p12']; } \ No newline at end of file diff --git a/certmanager/src/main/ets/model/CertMangerModel.ets b/certmanager/src/main/ets/model/CertMangerModel.ets index f5500fcea7611f48741d93fb28724b11e4360ed2..cf9e57b464c12a8c7e96af6b80481e992c3bff14 100755 --- a/certmanager/src/main/ets/model/CertMangerModel.ets +++ b/certmanager/src/main/ets/model/CertMangerModel.ets @@ -34,8 +34,7 @@ export enum CMModelErrorCode { CM_MODEL_ERROR_MAX_QUANTITY_REACHED = -7, CM_MODEL_ERROR_ALIAS_LENGTH_REACHED_LIMIT = -8, CM_MODEL_ERROR_PASSWORD_ERR = -9, - CM_MODEL_ERROR_ADVANCED_SECURITY = -10, - CM_MODEL_ERROR_ + CM_MODEL_ERROR_ADVANCED_SECURITY = -10 } export enum CMModelOptType { @@ -45,7 +44,6 @@ export enum CMModelOptType { CM_MODEL_OPT_APP_CRED = 3, CM_MODEL_OPT_PRIVATE_CRED = 4, CM_MODEL_OPT_SYSTEM_CRED = 5, - CM_MODEL_OPT_USER_CA_P7B = 6, } export enum CertManagerStore { @@ -261,12 +259,7 @@ export class CertMangerModel { console.info(TAG + 'installCertOrCred start'); switch (optType) { case CMModelOptType.CM_MODEL_OPT_USER_CA: - this.installUserCertificate(data, alias, optType, (errCode: CMModelErrorCode, uri: string) => { - callback(errCode, uri); - }); - break; - case CMModelOptType.CM_MODEL_OPT_USER_CA_P7B: - this.installUserCertificate(data, alias, optType, (errCode: CMModelErrorCode, uri: string) => { + this.installUserCertificate(data, alias, (errCode: CMModelErrorCode, uri: string) => { callback(errCode, uri); }); break; @@ -671,7 +664,7 @@ export class CertMangerModel { } } - private async installUserCertificate(data: Uint8Array, alias: string, optType: CMModelOptType, callback: Function): Promise { + private async installUserCertificate(data: Uint8Array, alias: string, callback: Function): Promise { console.info(TAG + 'installUserCertificate start'); if ((data === undefined) || (data.length === 0)) { callback(CMModelErrorCode.CM_MODEL_ERROR_INCORRECT_FORMAT); @@ -679,15 +672,9 @@ export class CertMangerModel { return; } try { - let certFormat: CertManager.CertFileFormat = CertManager.CertFileFormat.PEM_DER; - if (optType == CMModelOptType.CM_MODEL_OPT_USER_CA_P7B) { - certFormat = CertManager.CertFileFormat.P7B; - } let result = await CertManager.installUserTrustedCertificate({ inData: data, - alias: alias, - certFormat: certFormat, - certScope: CertManager.CertScope.CURRENT_USER + alias: alias }); console.info(TAG + 'installUserCertificate end'); callback(CMModelErrorCode.CM_MODEL_ERROR_SUCCESS, result.uri); diff --git a/certmanager/src/main/ets/model/PreventScreenshotsModel.ets b/certmanager/src/main/ets/model/PreventScreenshotsModel.ets index 45763f160de0c70de5f772edc4f8217b3b68834f..114b611c45cc80f7239199f73f6c2cada95c47da 100755 --- a/certmanager/src/main/ets/model/PreventScreenshotsModel.ets +++ b/certmanager/src/main/ets/model/PreventScreenshotsModel.ets @@ -47,7 +47,7 @@ export default class PreventScreenshotsModel { window.getLastWindow(context).then((window) => { windowClass = window; - console.info(TAG, 'Success in obtaining the top window data'); + console.info(TAG,'Success in obtaining the top window data'); windowClass.setWindowPrivacyMode(isPrivacyMode).catch((err: BusinessError) => { console.error(TAG, 'setWindowPrivacyMode failed: ' + JSON.stringify(err)); }) diff --git a/certmanager/src/main/ets/pages/certInstallFromStorage.ets b/certmanager/src/main/ets/pages/certInstallFromStorage.ets index e0e88143776e9ce7bb9c667c323c12e0983a55a1..0823a6accdead8efb646b23f1643eb4d75a1456a 100755 --- a/certmanager/src/main/ets/pages/certInstallFromStorage.ets +++ b/certmanager/src/main/ets/pages/certInstallFromStorage.ets @@ -30,8 +30,6 @@ import { RouterFileVo } from '../model/CertManagerVo/RouterInfoVo'; import { CredPwdInputParam } from './detail/CredPwdInputPage'; import { SheetParam } from '../common/util/SheetParam'; import FilterParams from '../common/constants/FileFilterParams'; -import { UIContext } from '@kit.ArkUI'; -import { common } from '@kit.AbilityKit'; const COPIES_NUM: number = 12; @@ -166,8 +164,7 @@ export struct CertInstallFromStorage { FileIoModel.getMediaFileSuffix(fileUri, (suffix: string | undefined) => { if (suffix !== undefined) { console.debug(TAG, 'suffix = ', suffix); - if ((suffix === 'cer') || (suffix === 'pem') || (suffix === 'crt') || (suffix === 'der') || - (suffix === 'p7b') || (suffix === 'spc')) { + if ((suffix === 'cer') || (suffix === 'pem') || (suffix === 'crt') || (suffix === 'der')) { CmInstallPresenter.getInstance().installCert(fileUri, '', suffix, false); } else { this.mFaPresenter.unrecognizedFileTips(); @@ -280,7 +277,7 @@ export struct CertInstallFromStorage { .onClick(() => { this.installCertFlag = false; AppStorage.setOrCreate('installSystemCred', true); - AppStorage.setOrCreate('installUserCred', false); + AppStorage.setOrCreate('installUserCred',false); if (this.isStartBySheet) { this.startInstallEvidenceBySheet(); } else { @@ -315,12 +312,11 @@ export struct CertInstallFromStorage { .onClick(() => { this.installCertFlag = false; AppStorage.setOrCreate('installUserCred', true); - AppStorage.setOrCreate('installSystemCred', false); + AppStorage.setOrCreate('installSystemCred',false); if (this.isStartBySheet) { this.startInstallEvidenceBySheet(); } else { this.mFaPresenter.startInstallEvidence(this.context); - new UIContext().getHostContext() as common.Context; } }) } diff --git a/certmanager/src/main/ets/pages/certPwdInput.ets b/certmanager/src/main/ets/pages/certPwdInput.ets index 07c197096f9735a1734baa3de01b222d97142579..620ee65234721e126e7f4440c4196756d5c482a9 100755 --- a/certmanager/src/main/ets/pages/certPwdInput.ets +++ b/certmanager/src/main/ets/pages/certPwdInput.ets @@ -135,6 +135,7 @@ struct CertPwdInput { left: $r('app.float.distance_16'), right: $r('app.float.distance_24'), }) + .enabled(this.certPwd !== undefined && this.certPwd.length > 0) .onClick(() => { let fileInfo: RouterFileVo = router.getParams() as RouterFileVo; this.isPasswordError = false; diff --git a/certmanager/src/main/ets/pages/detail/CredPwdInputPage.ets b/certmanager/src/main/ets/pages/detail/CredPwdInputPage.ets index 9e370500c8397ab8f679c6c1c5d291415d5399ce..17697195329370c2d42d52e7e212ad8123e323a4 100755 --- a/certmanager/src/main/ets/pages/detail/CredPwdInputPage.ets +++ b/certmanager/src/main/ets/pages/detail/CredPwdInputPage.ets @@ -104,6 +104,7 @@ export struct CredPwdInputPage { top: $r('app.float.distance_16'), bottom: $r('app.float.distance_24') }) + .enabled(this.certPwd !== undefined && this.certPwd.length > 0) .onClick(() => { if (this.credFile === undefined || this.credFile === null) { console.error(TAG + 'Cred file is undefined'); diff --git a/certmanager/src/main/ets/presenter/CmFaPresenter.ets b/certmanager/src/main/ets/presenter/CmFaPresenter.ets index e215154da56fbbf3724803262258cb43608ae341..f0e4060da2095cd492129bd96b96397262c57593 100755 --- a/certmanager/src/main/ets/presenter/CmFaPresenter.ets +++ b/certmanager/src/main/ets/presenter/CmFaPresenter.ets @@ -65,8 +65,7 @@ export default class CmFaPresenter { FileIoModel.getMediaFileSuffix(fileUri, (suffix: string | undefined) => { if (suffix !== undefined) { console.debug(TAG, 'suffix = ', suffix); - if ((suffix === 'cer') || (suffix === 'pem') || (suffix === 'crt') || (suffix === 'der') || - (suffix === 'p7b') || (suffix === 'spc')) { + if ((suffix === 'cer') || (suffix === 'pem') || (suffix === 'crt') || (suffix === 'der')) { CmInstallPresenter.getInstance().installCert(fileUri, '', suffix, true); } else { this.unrecognizedFileTips(); diff --git a/certmanager/src/main/ets/presenter/CmInstallPresenter.ets b/certmanager/src/main/ets/presenter/CmInstallPresenter.ets index 8434ec214f52efe39e0b61a0cc88eb1dd980c9f4..d45a7a513479df9c44ebbbf93d5b242105e8fe76 100755 --- a/certmanager/src/main/ets/presenter/CmInstallPresenter.ets +++ b/certmanager/src/main/ets/presenter/CmInstallPresenter.ets @@ -43,16 +43,14 @@ export default class CmInstallPresenter { aboutToDisappear(): void { this.optType = CMModelOptType.CM_MODEL_OPT_UNKNOWN; - AppStorage.setOrCreate('installUserCred', false); - AppStorage.setOrCreate('installSystemCred', false); + AppStorage.setOrCreate('installUserCred',false); + AppStorage.setOrCreate('installSystemCred',false); } updateCertFileType(suffix: string): void { console.debug(TAG + 'updateCertFileType suffix: ' + suffix); if ((suffix === 'cer') || (suffix === 'pem') || (suffix === 'crt') || (suffix === 'der')) { this.optType = CMModelOptType.CM_MODEL_OPT_USER_CA; - } else if ((suffix === 'p7b') || (suffix === 'spc')) { - this.optType = CMModelOptType.CM_MODEL_OPT_USER_CA_P7B; } else if (((suffix === 'p12') || (suffix === 'pfx')) && AppStorage.get('installUserCred') === true) { this.optType = CMModelOptType.CM_MODEL_OPT_APP_CRED;