~ubuntu-branches/ubuntu/hardy/openssl/hardy-security

« back to all changes in this revision

Viewing changes to crypto/dh/dh_err.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2005-12-13 21:37:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213213742-7em5nrw5c7ceegyd
Tags: 0.9.8a-5
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/* crypto/dh/dh_err.c */
2
2
/* ====================================================================
3
 
 * Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
 
3
 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
6
6
 * modification, are permitted provided that the following conditions
64
64
 
65
65
/* BEGIN ERROR CODES */
66
66
#ifndef OPENSSL_NO_ERR
 
67
 
 
68
#define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0)
 
69
#define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason)
 
70
 
67
71
static ERR_STRING_DATA DH_str_functs[]=
68
72
        {
69
 
{ERR_PACK(0,DH_F_DHPARAMS_PRINT,0),     "DHparams_print"},
70
 
{ERR_PACK(0,DH_F_DHPARAMS_PRINT_FP,0),  "DHparams_print_fp"},
71
 
{ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0),     "DH_compute_key"},
72
 
{ERR_PACK(0,DH_F_DH_GENERATE_KEY,0),    "DH_generate_key"},
73
 
{ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0),     "DH_generate_parameters"},
74
 
{ERR_PACK(0,DH_F_DH_NEW_METHOD,0),      "DH_new_method"},
 
73
{ERR_FUNC(DH_F_COMPUTE_KEY),    "COMPUTE_KEY"},
 
74
{ERR_FUNC(DH_F_DHPARAMS_PRINT), "DHparams_print"},
 
75
{ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),      "DHparams_print_fp"},
 
76
{ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS),   "DH_BUILTIN_GENPARAMS"},
 
77
{ERR_FUNC(DH_F_DH_NEW_METHOD),  "DH_new_method"},
 
78
{ERR_FUNC(DH_F_GENERATE_KEY),   "GENERATE_KEY"},
 
79
{ERR_FUNC(DH_F_GENERATE_PARAMETERS),    "GENERATE_PARAMETERS"},
75
80
{0,NULL}
76
81
        };
77
82
 
78
83
static ERR_STRING_DATA DH_str_reasons[]=
79
84
        {
80
 
{DH_R_BAD_GENERATOR                      ,"bad generator"},
81
 
{DH_R_NO_PRIVATE_VALUE                   ,"no private value"},
 
85
{ERR_REASON(DH_R_BAD_GENERATOR)          ,"bad generator"},
 
86
{ERR_REASON(DH_R_NO_PRIVATE_VALUE)       ,"no private value"},
 
87
{ERR_REASON(DH_R_INVALID_PUBKEY)         ,"invalid public key"},
82
88
{0,NULL}
83
89
        };
84
90
 
92
98
                {
93
99
                init=0;
94
100
#ifndef OPENSSL_NO_ERR
95
 
                ERR_load_strings(ERR_LIB_DH,DH_str_functs);
96
 
                ERR_load_strings(ERR_LIB_DH,DH_str_reasons);
 
101
                ERR_load_strings(0,DH_str_functs);
 
102
                ERR_load_strings(0,DH_str_reasons);
97
103
#endif
98
104
 
99
105
                }