index : openwrt/upstream	attitude_adjustment barrier_breaker chaos_calmer lede-17.01 less-old-master master old-master openwrt-18.06 openwrt-19.07 upstream
	upstream openwrt	James

aboutsummaryrefslogtreecommitdiffstats

log msg author committer range

path: root/package/kernel/cryptodev-linux

	Commit message (Collapse)	Author	Age	Files	Lines
*	cryptodev-linux: Fix error when compiling with 5.4 kernel	Jeffery To	2020-03-18	2	-1/+51
| | | | | | | | | | | | |	Currently, cryptodev-linux fails to compile with a '"crypto_givcipher_type" undefined' error for targets on the 5.4 kernel, e.g. armvirt[1]. This backports an upstream patch[2] that fixes this error. [1]: https://downloads.openwrt.org/snapshots/faillogs/aarch64_generic/base/cryptodev-linux/compile.txt [2]: https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Signed-off-by: Jeffery To <jeffery.to@gmail.com>
*	cryptodev-linux: remove DEFAULT redefinition	Eneas U de Queiroz	2020-01-15	1	-1/+0
| | | | | | | |	The 'DEFAULT:=m if ALL' line prevents the phase1 buildbots from building the package, and users from downloading it, since they use 'ALL_KMODS=y' but 'ALL' is not set. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
*	cryptodev-linux: Update to 1.10	Daniel Engberg	2019-01-12	1	-6/+5
| | | | | | |	Update cryptodev-linux to 1.10 Switch from git to codeload generated tarball Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
*	cryptodev-linux: move from packages feed	Eneas U de Queiroz	2018-12-03	1	-0/+60
	The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. This is actually a build dependency for /dev/crypto support in openssl. Since it is a kernel module, it belongs here anyway. - Removed Nikos Mavrogiannopoulos as maintainer. - Streamlined make flags Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>

generated by cgit v1.2.3 (git 2.25.1) at 2026-01-26 09:32:15 +0000

/*
 * Copyright (C) 2013-2015 Dominik Schürmann <dominik@dominikschuermann.de>
 * Copyright (C) 2015 Vincent Breitmoser <v.breitmoser@mugenguild.com>
 * Copyright (C) 2015 Adithya Abraham Philip <adithyaphilip@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

package org.sufficientlysecure.keychain.ui;

import android.app.Activity;
import android.support.v7.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Spinner;
import android.widget.TextView;

import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.DeleteResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.operations.results.RevokeResult;
import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.service.DeleteKeyringParcel;
import org.sufficientlysecure.keychain.service.RevokeKeyringParcel;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
import org.sufficientlysecure.keychain.util.Log;

import java.util.Date;
import java.util.HashMap;

public class DeleteKeyDialogActivity extends FragmentActivity {
    public static final String EXTRA_DELETE_MASTER_KEY_IDS = "extra_delete_master_key_ids";
    public static final String EXTRA_HAS_SECRET = "extra_has_secret";
    public static final String EXTRA_KEYSERVER = "extra_keyserver";

    private CryptoOperationHelper<DeleteKeyringParcel, DeleteResult> mDeleteOpHelper;
    private CryptoOperationHelper<RevokeKeyringParcel, RevokeResult> mRevokeOpHelper;

    private long[] mMasterKeyIds;
    private boolean mHasSecret;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        mDeleteOpHelper = new CryptoOperationHelper<>(1, DeleteKeyDialogActivity.this,
                getDeletionCallback(), R.string.progress_deleting);

        mRevokeOpHelper = new CryptoOperationHelper<>(2, this,
                getRevocationCallback(), R.string.progress_revoking_uploading);

        mMasterKeyIds = getIntent().getLongArrayExtra(EXTRA_DELETE_MASTER_KEY_IDS);
        mHasSecret = getIntent().getBooleanExtra(EXTRA_HAS_SECRET, false);

        if (mMasterKeyIds.length > 1 && mHasSecret) {
            // secret keys can only be deleted individually
            OperationResult.OperationLog log = new OperationResult.OperationLog();
            log.add(OperationResult.LogType.MSG_DEL_ERROR_MULTI_SECRET, 0);
            returnResult(new DeleteResult(OperationResult.RESULT_ERROR, log, 0,
                    mMasterKeyIds.length));
        }

        if (mMasterKeyIds.length == 1 && mHasSecret) {
            // if mMasterKeyIds.length == 0 we let the DeleteOperation respond
            try {
                HashMap<String, Object> data = new ProviderHelper(this).getUnifiedData(
                        mMasterKeyIds[0], new String[]{
                                KeychainContract.KeyRings.USER_ID,
                                KeychainContract.KeyRings.IS_REVOKED
                        }, new int[]{
                                ProviderHelper.FIELD_TYPE_STRING,
                                ProviderHelper.FIELD_TYPE_INTEGER
                        }
                );

                String name;
                KeyRing.UserId mainUserId = KeyRing.splitUserId(
                        (String) data.get(KeychainContract.KeyRings.USER_ID));
                if (mainUserId.name != null) {
                    name = mainUserId.name;
                } else {
                    name = getString(R.string.user_id_no_name);
                }

                if ((long) data.get(KeychainContract.KeyRings.IS_REVOKED) > 0) {
                    showNormalDeleteDialog();
                } else {
                    showRevokeDeleteDialog(name);
                }
            } catch (ProviderHelper.NotFoundException e) {
                Log.e(Constants.TAG,
                        "Secret key to delete not found at DeleteKeyDialogActivity for "
                                + mMasterKeyIds[0], e);
                finish();
            }
        } else {
            showNormalDeleteDialog();
        }
    }

    private void showNormalDeleteDialog() {

        DeleteKeyDialogFragment deleteKeyDialogFragment
                = DeleteKeyDialogFragment.newInstance(mMasterKeyIds, mHasSecret);

        deleteKeyDialogFragment.show(getSupportFragmentManager(), "deleteKeyDialog");

    }

    private void showRevokeDeleteDialog(String keyname) {

        RevokeDeleteDialogFragment fragment = RevokeDeleteDialogFragment.newInstance(keyname);
        fragment.show(getSupportFragmentManager(), "deleteRevokeDialog");
    }

    private void startRevocationOperation() {
        mRevokeOpHelper.cryptoOperation(new CryptoInputParcel(new Date(), false));
    }

    private void startDeletionOperation() {
        mDeleteOpHelper.cryptoOperation();
    }

    private CryptoOperationHelper.Callback<RevokeKeyringParcel, RevokeResult> getRevocationCallback() {

        return new CryptoOperationHelper.Callback<RevokeKeyringParcel, RevokeResult>() {
            @Override
            public RevokeKeyringParcel createOperationInput() {
                return new RevokeKeyringParcel(mMasterKeyIds[0], true,
                        getIntent().getStringExtra(EXTRA_KEYSERVER));
            }

            @Override
            public void onCryptoOperationSuccess(RevokeResult result) {
                returnResult(result);
            }

            @Override
            public void onCryptoOperationCancelled() {
                setResult(RESULT_CANCELED);
                finish();
            }

            @Override
            public void onCryptoOperationError(RevokeResult result) {
                returnResult(result);
            }

            @Override
            public boolean onCryptoSetProgress(String msg, int progress, int max) {
                return false;
            }
        };
    }

    private CryptoOperationHelper.Callback<DeleteKeyringParcel, DeleteResult> getDeletionCallback() {

        return new CryptoOperationHelper.Callback<DeleteKeyringParcel, DeleteResult>() {
            @Override
            public DeleteKeyringParcel createOperationInput() {
                return new DeleteKeyringParcel(mMasterKeyIds, mHasSecret);
            }

            @Override
            public void onCryptoOperationSuccess(DeleteResult result) {
                returnResult(result);
            }

            @Override
            public void onCryptoOperationCancelled() {
                setResult(RESULT_CANCELED);
                finish();
            }

            @Override
            public void onCryptoOperationError(DeleteResult result) {
                returnResult(result);
            }

            @Override
            public boolean onCryptoSetProgress(String msg, int progress, int max) {
                return false;
            }
        };
    }

    private void returnResult(OperationResult result) {
        Intent intent = new Intent();
        intent.putExtra(OperationResult.EXTRA_RESULT, result);
        setResult(RESULT_OK, intent);
        finish();
    }

    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
        mDeleteOpHelper.handleActivityResult(requestCode, resultCode, data);
        mRevokeOpHelper.handleActivityResult(requestCode, resultCode, data);
    }

    public static class DeleteKeyDialogFragment extends DialogFragment {

        private static final String ARG_DELETE_MASTER_KEY_IDS = "delete_master_key_ids";
        private static final String ARG_HAS_SECRET = "has_secret";

        private TextView mMainMessage;
        private View mInflateView;

        /**
         * Creates new instance of this delete file dialog fragment
         */
        public static DeleteKeyDialogFragment newInstance(long[] masterKeyIds, boolean hasSecret) {
            DeleteKeyDialogFragment frag = new DeleteKeyDialogFragment();
            Bundle args = new Bundle();

            args.putLongArray(ARG_DELETE_MASTER_KEY_IDS, masterKeyIds);
            args.putBoolean(ARG_HAS_SECRET, hasSecret);

            frag.setArguments(args);

            return frag;
        }

        @NonNull
        @Override
        public Dialog onCreateDialog(Bundle savedInstanceState) {
            final FragmentActivity activity = getActivity();

            final long[] masterKeyIds = getArguments().getLongArray(ARG_DELETE_MASTER_KEY_IDS);
            final boolean hasSecret = getArguments().getBoolean(ARG_HAS_SECRET);

            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);

            CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);

            // Setup custom View to display in AlertDialog
            LayoutInflater inflater = LayoutInflater.from(theme);
            mInflateView = inflater.inflate(R.layout.view_key_delete_fragment, null);
            builder.setView(mInflateView);

            mMainMessage = (TextView) mInflateView.findViewById(R.id.mainMessage);

            // If only a single key has been selected
            if (masterKeyIds.length == 1) {
                long masterKeyId = masterKeyIds[0];

                try {
                    HashMap<String, Object> data = new ProviderHelper(activity).getUnifiedData(
                            masterKeyId, new String[]{
                                    KeychainContract.KeyRings.USER_ID,
                                    KeychainContract.KeyRings.HAS_ANY_SECRET
                            }, new int[]{
                                    ProviderHelper.FIELD_TYPE_STRING,
                                    ProviderHelper.FIELD_TYPE_INTEGER
                            }
                    );
                    String name;
                    KeyRing.UserId mainUserId = KeyRing.splitUserId((String) data.get(KeychainContract.KeyRings.USER_ID));
                    if (mainUserId.name != null) {
                        name = mainUserId.name;
                    } else {
                        name = getString(R.string.user_id_no_name);
                    }

                    if (hasSecret) {
                        // show title only for secret key deletions,
                        // see http://www.google.com/design/spec/components/dialogs.html#dialogs-behavior
                        builder.setTitle(getString(R.string.title_delete_secret_key, name));
                        mMainMessage.setText(getString(R.string.secret_key_deletion_confirmation, name));
                    } else {
                        mMainMessage.setText(getString(R.string.public_key_deletetion_confirmation, name));
                    }
                } catch (ProviderHelper.NotFoundException e) {
                    dismiss();
                    return null;
                }
            } else {
                mMainMessage.setText(R.string.key_deletion_confirmation_multi);
            }

            builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
                @Override
                public void onClick(DialogInterface dialog, int which) {

                    ((DeleteKeyDialogActivity) getActivity()).startDeletionOperation();
                }
            });

            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {

                @Override
                public void onClick(DialogInterface dialog, int id) {
                    dialog.cancel();
                }
            });

            return builder.show();
        }

        @Override
        public void onCancel(DialogInterface dialog) {
            super.onCancel(dialog);
            getActivity().setResult(RESULT_CANCELED);
            getActivity().finish();
        }
    }

    public static class RevokeDeleteDialogFragment extends DialogFragment {

        public static final String ARG_KEY_NAME = "arg_key_name";

        public static RevokeDeleteDialogFragment newInstance(String keyName) {
            Bundle args = new Bundle();
            args.putString(ARG_KEY_NAME, keyName);
            RevokeDeleteDialogFragment frag = new RevokeDeleteDialogFragment();
            frag.setArguments(args);
            return frag;
        }

        @NonNull
        @Override
        public Dialog onCreateDialog(Bundle savedInstanceState) {
            final Activity activity = getActivity();

            final String CHOICE_REVOKE = getString(R.string.del_rev_dialog_choice_rev_upload);
            final String CHOICE_DELETE = getString(R.string.del_rev_dialog_choice_delete);

            ContextThemeWrapper theme = ThemeChanger.getDialogThemeWrapper(activity);

            CustomAlertDialogBuilder builder = new CustomAlertDialogBuilder(theme);
            builder.setTitle(getString(R.string.del_rev_dialog_title,
                    getArguments().get(ARG_KEY_NAME)));

            LayoutInflater inflater = LayoutInflater.from(theme);
            View view = inflater.inflate(R.layout.del_rev_dialog, null);
            builder.setView(view);

            final Spinner spinner = (Spinner) view.findViewById(R.id.spinner);

            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {

                @Override
                public void onClick(DialogInterface dialog, int id) {
                    dialog.cancel();
                }
            });

            builder.setPositiveButton(R.string.del_rev_dialog_btn_revoke,
                    new DialogInterface.OnClickListener() {
                        @Override
                        public void onClick(DialogInterface dialog, int which) {

                            String choice = spinner.getSelectedItem().toString();
                            if (choice.equals(CHOICE_REVOKE)) {
                                ((DeleteKeyDialogActivity) activity)
                                        .startRevocationOperation();
                            } else if (choice.equals(CHOICE_DELETE)) {
                                ((DeleteKeyDialogActivity) activity)
                                        .showNormalDeleteDialog();
                            } else {
                                throw new AssertionError(
                                        "Unsupported delete type in RevokeDeleteDialogFragment");
                            }
                        }
                    });

            final AlertDialog alertDialog = builder.show();

            spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
                public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {

                    String choice = parent.getItemAtPosition(pos).toString();

                    if (choice.equals(CHOICE_REVOKE)) {
                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
                                .setText(R.string.del_rev_dialog_btn_revoke);
                    } else if (choice.equals(CHOICE_DELETE)) {
                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
                                .setText(R.string.del_rev_dialog_btn_delete);
                    } else {
                        throw new AssertionError(
                                "Unsupported delete type in RevokeDeleteDialogFragment");
                    }
                }

                public void onNothingSelected(AdapterView<?> parent) {
                }
            });

            return alertDialog;
        }

        @Override
        public void onCancel(DialogInterface dialog) {
            super.onCancel(dialog);
            getActivity().setResult(RESULT_CANCELED);
            getActivity().finish();
        }
    }

}