From owner-svn-soc-all@freebsd.org Sat Jul 18 12:54:38 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 010069A3011 for ; Sat, 18 Jul 2015 12:54:38 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5AE51E0C for ; Sat, 18 Jul 2015 12:54:37 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6ICsbiD084509 for ; Sat, 18 Jul 2015 12:54:37 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6ICsb5m084507 for svn-soc-all@FreeBSD.org; Sat, 18 Jul 2015 12:54:37 GMT (envelope-from def@FreeBSD.org) Date: Sat, 18 Jul 2015 12:54:37 GMT Message-Id: <201507181254.t6ICsb5m084507@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288521 - soc2013/def/crashdump-head/sbin/cryptcore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 12:54:38 -0000 Author: def Date: Sat Jul 18 12:54:36 2015 New Revision: 288521 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288521 Log: Don't cast pointers returned by calloc and realloc. Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Sat Jul 18 12:49:56 2015 (r288520) +++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Sat Jul 18 12:54:36 2015 (r288521) @@ -51,7 +51,7 @@ pjdlog_exitx(1, "Unable to read data from %s.", pubkeyfile); pubkeysize = RSA_size(pubkey); - encryptedkey = (uint8_t *)calloc(1, pubkeysize); + encryptedkey = calloc(1, pubkeysize); if (encryptedkey == NULL) pjdlog_exitx(1, "Unable to allocate encrypted key"); @@ -113,7 +113,7 @@ pjdlog_exitx(1, "Unable to allocate an RSA structure."); EVP_CIPHER_CTX_init(&ctx); - kdk = (struct kerneldumpkey *)calloc(1, sizeof(struct kerneldumpkey)); + kdk = calloc(1, sizeof(struct kerneldumpkey)); if (kdk == NULL) pjdlog_exit(1, "Unable to allocate kernel dump key"); @@ -122,7 +122,7 @@ pjdlog_exit(1, "Unable to open %s", keyfile); size = (int)read(fd, kdk, sizeof(struct kerneldumpkey)); if (size == sizeof(struct kerneldumpkey)) { - kdk = (struct kerneldumpkey *)realloc(kdk, kdk->kdk_size); + kdk = realloc(kdk, kdk->kdk_size); size += read(fd, &kdk->kdk_encryptedkey, kdk->kdk_size - sizeof(struct kerneldumpkey)); }