Attachment #886046 for bug #925557

View | Details | Raw Unified | Return to bug 925557
Collapse All | Expand All

Lines 34-40 Link Here

(-)pinentry-1.2.1/fltk/main.cxx (-1 lines)
34	#include <getopt.h>	34	#include <getopt.h>
35	#include <assert.h>	35	#include <assert.h>
36		36
37	#include "memory.h"
38	#include <memory>	37	#include <memory>
39		38
40	#include <pinentry.h>	39	#include <pinentry.h>

Lines 32-38 Link Here

(-)pinentry-1.2.1/fltk/pinwindow.cxx (-1 / +1 lines)
32	#include <FL/Fl_Return_Button.H>	32	#include <FL/Fl_Return_Button.H>
33	#include <FL/Fl_Pixmap.H>	33	#include <FL/Fl_Pixmap.H>
34		34
35	#include "memory.h"	35	#include "../secmem/secmem.h"
36		36
37	#include "encrypt.xpm"	37	#include "encrypt.xpm"
38	#include "icon.xpm"	38	#include "icon.xpm"

Lines 30-37 Link Here

(-)pinentry-1.2.1/gnome3/pinentry-gnome3.c (-2 lines)
30		30
31	#include <assuan.h>	31	#include <assuan.h>
32		32
33	#include "memory.h"
34
35	#include "pinentry.h"	33	#include "pinentry.h"
36		34
37	#ifdef FALLBACK_CURSES	35	#ifdef FALLBACK_CURSES

Lines 31-37 Link Here

(-)pinentry-1.2.1/pinentry/password-cache.c (-1 / +1 lines)
31	#endif	31	#endif
32		32
33	#include "password-cache.h"	33	#include "password-cache.h"
34	#include "memory.h"	34	#include "../secmem/secmem.h"
35		35
36	#ifdef HAVE_LIBSECRET	36	#ifdef HAVE_LIBSECRET
37	static const SecretSchema *	37	static const SecretSchema *

Lines 44-50 Link Here

(-)pinentry-1.2.1/pinentry/pinentry.c (-1 lines)
44		44
45	#include <assuan.h>	45	#include <assuan.h>
46		46
47	#include "memory.h"
48	#include "secmem-util.h"	47	#include "secmem-util.h"
49	#include "argparse.h"	48	#include "argparse.h"
50	#include "pinentry.h"	49	#include "pinentry.h"




#include <utime.h>
#endif /*HAVE_UTIME_H*/

#include <memory.h>

#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif /*HAVE_WCHAR_H*/

#ifndef HAVE_DOSISH_SYSTEM
  int no_input = 1;
#endif

#ifdef HAVE_NCURSESW
  char *old_ctype = NULL;
#endif

#ifdef HAVE_NCURSESW
  if (pinentry->lc_ctype)
    {
      old_ctype = strdup (setlocale (LC_CTYPE, NULL));

Lines 48-54 Link Here

(-)pinentry-1.2.1/pinentry/pinentry-emacs.c (-1 / +1 lines)
48	#include <assuan.h>	48	#include <assuan.h>
49		49
50	#include "pinentry-emacs.h"	50	#include "pinentry-emacs.h"
51	#include "memory.h"	51	#include "../secmem/secmem.h"
52	#include "secmem-util.h"	52	#include "secmem-util.h"
53		53
54	/* The communication mechanism is similar to emacsclient, but there	54	/* The communication mechanism is similar to emacsclient, but there

Lines 21-26 Link Here

(-)pinentry-1.2.1/pinentry/pinentry.h (+2 lines)
21	#ifndef PINENTRY_H	21	#ifndef PINENTRY_H
22	#define PINENTRY_H	22	#define PINENTRY_H
23		23
		24	#include "../secmem/secmem.h"
		25
24	#ifdef __cplusplus	26	#ifdef __cplusplus
25	extern "C" {	27	extern "C" {
26	#if 0	28	#if 0

Lines 22-28 Link Here

(-)pinentry-1.2.1/secmem/Makefile.am (-1 / +1 lines)
22	noinst_LIBRARIES = libsecmem.a	22	noinst_LIBRARIES = libsecmem.a
23		23
24	libsecmem_a_SOURCES = \	24	libsecmem_a_SOURCES = \
25	memory.h \	25	secmem.h \
26	secmem-util.h \	26	secmem-util.h \
27	util.h \	27	util.h \
28	secmem.c \	28	secmem.c \




/* Quintuple Agent secure memory allocation
 * Copyright (C) 1998,1999 Free Software Foundation, Inc.
 * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
 *
 * 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 2 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 <https://www.gnu.org/licenses/>.
 * SPDX-License-Identifier: GPL-2.0+
 */

#ifndef _MEMORY_H
#define _MEMORY_H

#include <sys/types.h>

#ifdef __cplusplus
extern "C" {
#if 0
}
#endif
#endif


/* values for flags, hardcoded in secmem.c */
#define SECMEM_WARN		0
#define SECMEM_DONT_WARN	1
#define SECMEM_SUSPEND_WARN	2

void secmem_init( size_t npool );
void secmem_term( void );
void *secmem_malloc( size_t size );
void *secmem_realloc( void *a, size_t newsize );
void secmem_free( void *a );
int  m_is_secure( const void *p );
void secmem_dump_stats(void);
void secmem_set_flags( unsigned flags );
unsigned secmem_get_flags(void);
size_t secmem_get_max_size (void);

#if 0
{
#endif
#ifdef __cplusplus
}
#endif
#endif /* _MEMORY_H */

Lines 34-40 Link Here

(-)pinentry-1.2.1/secmem/secmem.c (-1 / +1 lines)
34	#endif	34	#endif
35	#include <string.h>	35	#include <string.h>
36		36
37	#include "memory.h"	37	#include "secmem.h"
38		38
39	#ifdef ORIGINAL_GPG_VERSION	39	#ifdef ORIGINAL_GPG_VERSION
40	#include "types.h"	40	#include "types.h"

Lines 19-25 Link Here

(-)pinentry-1.2.1/secmem/secmem++.h (-1 / +1 lines)
19	#ifndef __SECMEM_SECMEMPP_H__	19	#ifndef __SECMEM_SECMEMPP_H__
20	#define __SECMEM_SECMEMPP_H__	20	#define __SECMEM_SECMEMPP_H__
21		21
22	#include "secmem/memory.h"	22	#include "../secmem/secmem.h"
23	#include <cstddef>	23	#include <cstddef>
24		24
25	namespace secmem {	25	namespace secmem {




/* Quintuple Agent secure memory allocation
 * Copyright (C) 1998,1999 Free Software Foundation, Inc.
 * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
 *
 * 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 2 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 <https://www.gnu.org/licenses/>.
 * SPDX-License-Identifier: GPL-2.0+
 */

#ifndef _MEMORY_H
#define _MEMORY_H

#include <sys/types.h>

#ifdef __cplusplus
extern "C" {
#if 0
}
#endif
#endif


/* values for flags, hardcoded in secmem.c */
#define SECMEM_WARN		0
#define SECMEM_DONT_WARN	1
#define SECMEM_SUSPEND_WARN	2

void secmem_init( size_t npool );
void secmem_term( void );
void *secmem_malloc( size_t size );
void *secmem_realloc( void *a, size_t newsize );
void secmem_free( void *a );
int  m_is_secure( const void *p );
void secmem_dump_stats(void);
void secmem_set_flags( unsigned flags );
unsigned secmem_get_flags(void);
size_t secmem_get_max_size (void);

#if 0
{
#endif
#ifdef __cplusplus
}
#endif
#endif /* _MEMORY_H */

Lines 65-71 Link Here

(-)pinentry-1.2.1/tqt/secqstring.h (-1 / +1 lines)
65		65
66	extern "C"	66	extern "C"
67	{	67	{
68	#include "memory.h"	68	#include "../secmem/secmem.h"
69	}	69	}
70		70
71	/* We need the original qchar and qstring for transparent conversion	71	/* We need the original qchar and qstring for transparent conversion

Lines 41-47 Link Here

(-)pinentry-1.2.1/tty/pinentry-tty.c (-1 lines)
41	#include <gpg-error.h>	41	#include <gpg-error.h>
42		42
43	#include "pinentry.h"	43	#include "pinentry.h"
44	#include "memory.h"
45		44
46	#ifndef HAVE_DOSISH_SYSTEM	45	#ifndef HAVE_DOSISH_SYSTEM
47	static int timed_out;	46	static int timed_out;

Lines 29-35 Link Here

(-)pinentry-1.2.1/w32/main.c (-1 lines)
29	#endif	29	#endif
30		30
31	#include "pinentry.h"	31	#include "pinentry.h"
32	#include "memory.h"
33		32
34	#include "resource.h"	33	#include "resource.h"
35	/* #include "msgcodes.h" */	34	/* #include "msgcodes.h" */

Return to bug 925557

Lines 62-69 Link Here

(-)pinentry-1.2.1/pinentry/pinentry-curses.c (-3 / +2 lines)
62	#include <utime.h>	62	#include <utime.h>
63	#endif /HAVE_UTIME_H/	63	#endif /HAVE_UTIME_H/
64		64
65	#include <memory.h>
66
67	#ifdef HAVE_WCHAR_H	65	#ifdef HAVE_WCHAR_H
68	#include <wchar.h>	66	#include <wchar.h>
69	#endif /HAVE_WCHAR_H/	67	#endif /HAVE_WCHAR_H/
Lines 1017-1026 Link Here
1017	#ifndef HAVE_DOSISH_SYSTEM	1015	#ifndef HAVE_DOSISH_SYSTEM
1018	int no_input = 1;	1016	int no_input = 1;
1019	#endif	1017	#endif
1020
1021	#ifdef HAVE_NCURSESW	1018	#ifdef HAVE_NCURSESW
1022	char *old_ctype = NULL;	1019	char *old_ctype = NULL;
		1020	#endif
1023		1021
		1022	#ifdef HAVE_NCURSESW
1024	if (pinentry->lc_ctype)	1023	if (pinentry->lc_ctype)
1025	{	1024	{
1026	old_ctype = strdup (setlocale (LC_CTYPE, NULL));	1025	old_ctype = strdup (setlocale (LC_CTYPE, NULL));

Lines 1-55 Link Here

(-)pinentry-1.2.1/secmem/memory.h (-55 lines)
1	/* Quintuple Agent secure memory allocation
2	* Copyright (C) 1998,1999 Free Software Foundation, Inc.
3	* Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
4	*
5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of the GNU General Public License as published by
7	* the Free Software Foundation; either version 2 of the License, or
8	* (at your option) any later version.
9	*
10	* This program is distributed in the hope that it will be useful,
11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	* GNU General Public License for more details.
14	*
15	* You should have received a copy of the GNU General Public License
16	* along with this program; if not, see <https://www.gnu.org/licenses/>.
17	* SPDX-License-Identifier: GPL-2.0+
18	*/
19
20	#ifndef _MEMORY_H
21	#define _MEMORY_H
22
23	#include <sys/types.h>
24
25	#ifdef __cplusplus
26	extern "C" {
27	#if 0
28	}
29	#endif
30	#endif
31
32
33	/* values for flags, hardcoded in secmem.c */
34	#define SECMEM_WARN 0
35	#define SECMEM_DONT_WARN 1
36	#define SECMEM_SUSPEND_WARN 2
37
38	void secmem_init( size_t npool );
39	void secmem_term( void );
40	void *secmem_malloc( size_t size );
41	void secmem_realloc( void a, size_t newsize );
42	void secmem_free( void *a );
43	int m_is_secure( const void *p );
44	void secmem_dump_stats(void);
45	void secmem_set_flags( unsigned flags );
46	unsigned secmem_get_flags(void);
47	size_t secmem_get_max_size (void);
48
49	#if 0
50	{
51	#endif
52	#ifdef __cplusplus
53	}
54	#endif
55	#endif /* _MEMORY_H */

Line 0 Link Here

(-)pinentry-1.2.1/secmem/secmem.h (+55 lines)
	1	/* Quintuple Agent secure memory allocation
	2	* Copyright (C) 1998,1999 Free Software Foundation, Inc.
	3	* Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
	4	*
	5	* This program is free software; you can redistribute it and/or modify
	6	* it under the terms of the GNU General Public License as published by
	7	* the Free Software Foundation; either version 2 of the License, or
	8	* (at your option) any later version.
	9	*
	10	* This program is distributed in the hope that it will be useful,
	11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	* GNU General Public License for more details.
	14	*
	15	* You should have received a copy of the GNU General Public License
	16	* along with this program; if not, see <https://www.gnu.org/licenses/>.
	17	* SPDX-License-Identifier: GPL-2.0+
	18	*/
	19
	20	#ifndef _MEMORY_H
	21	#define _MEMORY_H
	22
	23	#include <sys/types.h>
	24
	25	#ifdef __cplusplus
	26	extern "C" {
	27	#if 0
	28	}
	29	#endif
	30	#endif
	31
	32
	33	/* values for flags, hardcoded in secmem.c */
	34	#define SECMEM_WARN 0
	35	#define SECMEM_DONT_WARN 1
	36	#define SECMEM_SUSPEND_WARN 2
	37
	38	void secmem_init( size_t npool );
	39	void secmem_term( void );
	40	void *secmem_malloc( size_t size );
	41	void secmem_realloc( void a, size_t newsize );
	42	void secmem_free( void *a );
	43	int m_is_secure( const void *p );
	44	void secmem_dump_stats(void);
	45	void secmem_set_flags( unsigned flags );
	46	unsigned secmem_get_flags(void);
	47	size_t secmem_get_max_size (void);
	48
	49	#if 0
	50	{
	51	#endif
	52	#ifdef __cplusplus
	53	}
	54	#endif
	55	#endif /* _MEMORY_H */