Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f75516a8 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: keys - Revert "convert public key to akcipher api" 



This needs to go through the security tree so I'm reverting the
patches for now.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ed1afac9

crypto/asymmetric_keys/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE 


config PUBLIC_KEY_ALGO_RSA

	tristate "RSA public-key algorithm"

	select CRYPTO_RSA

	select MPILIB

	help

	  This option enables support for the RSA algorithm (PKCS#1, RFC3447).

crypto/asymmetric_keys/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -16,18 +16,21 @@ obj-$(CONFIG_X509_CERTIFICATE_PARSER) += x509_key_parser.o 
x509_key_parser-y := \

	x509-asn1.o \

	x509_akid-asn1.o \

	x509_rsakey-asn1.o \

	x509_cert_parser.o \

	x509_public_key.o



$(obj)/x509_cert_parser.o: \

	$(obj)/x509-asn1.h \

	$(obj)/x509_akid-asn1.h



	$(obj)/x509_akid-asn1.h \

	$(obj)/x509_rsakey-asn1.h

$(obj)/x509-asn1.o: $(obj)/x509-asn1.c $(obj)/x509-asn1.h

$(obj)/x509_akid-asn1.o: $(obj)/x509_akid-asn1.c $(obj)/x509_akid-asn1.h

$(obj)/x509_rsakey-asn1.o: $(obj)/x509_rsakey-asn1.c $(obj)/x509_rsakey-asn1.h



clean-files	+= x509-asn1.c x509-asn1.h

clean-files	+= x509_akid-asn1.c x509_akid-asn1.h

clean-files	+= x509_rsakey-asn1.c x509_rsakey-asn1.h



#

# PKCS#7 message handling

crypto/asymmetric_keys/pkcs7_parser.c

+7 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/slab.h>

#include <linux/err.h>

#include <linux/oid_registry.h>

#include <crypto/public_key.h>

#include "public_key.h"

#include "pkcs7_parser.h"

#include "pkcs7-asn1.h"
@@ -44,7 +44,7 @@ struct pkcs7_parse_context { 
static void pkcs7_free_signed_info(struct pkcs7_signed_info *sinfo)

{

	if (sinfo) {

		kfree(sinfo->sig.s);

		mpi_free(sinfo->sig.mpi[0]);

		kfree(sinfo->sig.digest);

		kfree(sinfo->signing_cert_id);

		kfree(sinfo);
@@ -614,14 +614,16 @@ int pkcs7_sig_note_signature(void *context, size_t hdrlen, 
			     const void *value, size_t vlen)

{

	struct pkcs7_parse_context *ctx = context;

	MPI mpi;



	BUG_ON(ctx->sinfo->sig.pkey_algo != PKEY_ALGO_RSA);



	ctx->sinfo->sig.s = kmemdup(value, vlen, GFP_KERNEL);

	if (!ctx->sinfo->sig.s)

	mpi = mpi_read_raw_data(value, vlen);

	if (!mpi)

		return -ENOMEM;



	ctx->sinfo->sig.s_size = vlen;

	ctx->sinfo->sig.mpi[0] = mpi;

	ctx->sinfo->sig.nr_mpi = 1;

	return 0;

}

crypto/asymmetric_keys/pkcs7_trust.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/asn1.h>

#include <linux/key.h>

#include <keys/asymmetric-type.h>

#include <crypto/public_key.h>

#include "public_key.h"

#include "pkcs7_parser.h"



/**

crypto/asymmetric_keys/pkcs7_verify.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/err.h>

#include <linux/asn1.h>

#include <crypto/hash.h>

#include <crypto/public_key.h>

#include "public_key.h"

#include "pkcs7_parser.h"



/*