diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_err.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_err.c | 124 |
1 files changed, 64 insertions, 60 deletions
diff --git a/src/lib/libcrypto/ec/ec_err.c b/src/lib/libcrypto/ec/ec_err.c index d37b6aba87..5b70f94382 100644 --- a/src/lib/libcrypto/ec/ec_err.c +++ b/src/lib/libcrypto/ec/ec_err.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* crypto/ec/ec_err.c */ | 1 | /* crypto/ec/ec_err.c */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
@@ -64,70 +64,74 @@ | |||
64 | 64 | ||
65 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
66 | #ifndef OPENSSL_NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
67 | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EC,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_EC,0,reason) | ||
70 | |||
67 | static ERR_STRING_DATA EC_str_functs[]= | 71 | static ERR_STRING_DATA EC_str_functs[]= |
68 | { | 72 | { |
69 | {ERR_PACK(0,EC_F_COMPUTE_WNAF,0), "COMPUTE_WNAF"}, | 73 | {ERR_FUNC(EC_F_COMPUTE_WNAF), "COMPUTE_WNAF"}, |
70 | {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_DECODE,0), "ec_GFp_mont_field_decode"}, | 74 | {ERR_FUNC(EC_F_EC_GFP_MONT_FIELD_DECODE), "ec_GFp_mont_field_decode"}, |
71 | {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_ENCODE,0), "ec_GFp_mont_field_encode"}, | 75 | {ERR_FUNC(EC_F_EC_GFP_MONT_FIELD_ENCODE), "ec_GFp_mont_field_encode"}, |
72 | {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_MUL,0), "ec_GFp_mont_field_mul"}, | 76 | {ERR_FUNC(EC_F_EC_GFP_MONT_FIELD_MUL), "ec_GFp_mont_field_mul"}, |
73 | {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_SQR,0), "ec_GFp_mont_field_sqr"}, | 77 | {ERR_FUNC(EC_F_EC_GFP_MONT_FIELD_SQR), "ec_GFp_mont_field_sqr"}, |
74 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP,0), "ec_GFp_simple_group_set_curve_GFp"}, | 78 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP), "ec_GFp_simple_group_set_curve_GFp"}, |
75 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR,0), "ec_GFp_simple_group_set_generator"}, | 79 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR), "ec_GFp_simple_group_set_generator"}, |
76 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_MAKE_AFFINE,0), "ec_GFp_simple_make_affine"}, | 80 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_MAKE_AFFINE), "ec_GFp_simple_make_affine"}, |
77 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_OCT2POINT,0), "ec_GFp_simple_oct2point"}, | 81 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_OCT2POINT), "ec_GFp_simple_oct2point"}, |
78 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT2OCT,0), "ec_GFp_simple_point2oct"}, | 82 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_POINT2OCT), "ec_GFp_simple_point2oct"}, |
79 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE,0), "ec_GFp_simple_points_make_affine"}, | 83 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE), "ec_GFp_simple_points_make_affine"}, |
80 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP,0), "ec_GFp_simple_point_get_affine_coordinates_GFp"}, | 84 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP), "ec_GFp_simple_point_get_affine_coordinates_GFp"}, |
81 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP,0), "ec_GFp_simple_point_set_affine_coordinates_GFp"}, | 85 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP), "ec_GFp_simple_point_set_affine_coordinates_GFp"}, |
82 | {ERR_PACK(0,EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP,0), "ec_GFp_simple_set_compressed_coordinates_GFp"}, | 86 | {ERR_FUNC(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP), "ec_GFp_simple_set_compressed_coordinates_GFp"}, |
83 | {ERR_PACK(0,EC_F_EC_GROUP_COPY,0), "EC_GROUP_copy"}, | 87 | {ERR_FUNC(EC_F_EC_GROUP_COPY), "EC_GROUP_copy"}, |
84 | {ERR_PACK(0,EC_F_EC_GROUP_GET0_GENERATOR,0), "EC_GROUP_get0_generator"}, | 88 | {ERR_FUNC(EC_F_EC_GROUP_GET0_GENERATOR), "EC_GROUP_get0_generator"}, |
85 | {ERR_PACK(0,EC_F_EC_GROUP_GET_COFACTOR,0), "EC_GROUP_get_cofactor"}, | 89 | {ERR_FUNC(EC_F_EC_GROUP_GET_COFACTOR), "EC_GROUP_get_cofactor"}, |
86 | {ERR_PACK(0,EC_F_EC_GROUP_GET_CURVE_GFP,0), "EC_GROUP_get_curve_GFp"}, | 90 | {ERR_FUNC(EC_F_EC_GROUP_GET_CURVE_GFP), "EC_GROUP_get_curve_GFp"}, |
87 | {ERR_PACK(0,EC_F_EC_GROUP_GET_ORDER,0), "EC_GROUP_get_order"}, | 91 | {ERR_FUNC(EC_F_EC_GROUP_GET_ORDER), "EC_GROUP_get_order"}, |
88 | {ERR_PACK(0,EC_F_EC_GROUP_NEW,0), "EC_GROUP_new"}, | 92 | {ERR_FUNC(EC_F_EC_GROUP_NEW), "EC_GROUP_new"}, |
89 | {ERR_PACK(0,EC_F_EC_GROUP_PRECOMPUTE_MULT,0), "EC_GROUP_precompute_mult"}, | 93 | {ERR_FUNC(EC_F_EC_GROUP_PRECOMPUTE_MULT), "EC_GROUP_precompute_mult"}, |
90 | {ERR_PACK(0,EC_F_EC_GROUP_SET_CURVE_GFP,0), "EC_GROUP_set_curve_GFp"}, | 94 | {ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GFP), "EC_GROUP_set_curve_GFp"}, |
91 | {ERR_PACK(0,EC_F_EC_GROUP_SET_EXTRA_DATA,0), "EC_GROUP_set_extra_data"}, | 95 | {ERR_FUNC(EC_F_EC_GROUP_SET_EXTRA_DATA), "EC_GROUP_set_extra_data"}, |
92 | {ERR_PACK(0,EC_F_EC_GROUP_SET_GENERATOR,0), "EC_GROUP_set_generator"}, | 96 | {ERR_FUNC(EC_F_EC_GROUP_SET_GENERATOR), "EC_GROUP_set_generator"}, |
93 | {ERR_PACK(0,EC_F_EC_POINTS_MAKE_AFFINE,0), "EC_POINTs_make_affine"}, | 97 | {ERR_FUNC(EC_F_EC_POINTS_MAKE_AFFINE), "EC_POINTs_make_affine"}, |
94 | {ERR_PACK(0,EC_F_EC_POINTS_MUL,0), "EC_POINTs_mul"}, | 98 | {ERR_FUNC(EC_F_EC_POINTS_MUL), "EC_POINTs_mul"}, |
95 | {ERR_PACK(0,EC_F_EC_POINT_ADD,0), "EC_POINT_add"}, | 99 | {ERR_FUNC(EC_F_EC_POINT_ADD), "EC_POINT_add"}, |
96 | {ERR_PACK(0,EC_F_EC_POINT_CMP,0), "EC_POINT_cmp"}, | 100 | {ERR_FUNC(EC_F_EC_POINT_CMP), "EC_POINT_cmp"}, |
97 | {ERR_PACK(0,EC_F_EC_POINT_COPY,0), "EC_POINT_copy"}, | 101 | {ERR_FUNC(EC_F_EC_POINT_COPY), "EC_POINT_copy"}, |
98 | {ERR_PACK(0,EC_F_EC_POINT_DBL,0), "EC_POINT_dbl"}, | 102 | {ERR_FUNC(EC_F_EC_POINT_DBL), "EC_POINT_dbl"}, |
99 | {ERR_PACK(0,EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP,0), "EC_POINT_get_affine_coordinates_GFp"}, | 103 | {ERR_FUNC(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP), "EC_POINT_get_affine_coordinates_GFp"}, |
100 | {ERR_PACK(0,EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP,0), "EC_POINT_get_Jprojective_coordinates_GFp"}, | 104 | {ERR_FUNC(EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP), "EC_POINT_get_Jprojective_coordinates_GFp"}, |
101 | {ERR_PACK(0,EC_F_EC_POINT_IS_AT_INFINITY,0), "EC_POINT_is_at_infinity"}, | 105 | {ERR_FUNC(EC_F_EC_POINT_IS_AT_INFINITY), "EC_POINT_is_at_infinity"}, |
102 | {ERR_PACK(0,EC_F_EC_POINT_IS_ON_CURVE,0), "EC_POINT_is_on_curve"}, | 106 | {ERR_FUNC(EC_F_EC_POINT_IS_ON_CURVE), "EC_POINT_is_on_curve"}, |
103 | {ERR_PACK(0,EC_F_EC_POINT_MAKE_AFFINE,0), "EC_POINT_make_affine"}, | 107 | {ERR_FUNC(EC_F_EC_POINT_MAKE_AFFINE), "EC_POINT_make_affine"}, |
104 | {ERR_PACK(0,EC_F_EC_POINT_NEW,0), "EC_POINT_new"}, | 108 | {ERR_FUNC(EC_F_EC_POINT_NEW), "EC_POINT_new"}, |
105 | {ERR_PACK(0,EC_F_EC_POINT_OCT2POINT,0), "EC_POINT_oct2point"}, | 109 | {ERR_FUNC(EC_F_EC_POINT_OCT2POINT), "EC_POINT_oct2point"}, |
106 | {ERR_PACK(0,EC_F_EC_POINT_POINT2OCT,0), "EC_POINT_point2oct"}, | 110 | {ERR_FUNC(EC_F_EC_POINT_POINT2OCT), "EC_POINT_point2oct"}, |
107 | {ERR_PACK(0,EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP,0), "EC_POINT_set_affine_coordinates_GFp"}, | 111 | {ERR_FUNC(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP), "EC_POINT_set_affine_coordinates_GFp"}, |
108 | {ERR_PACK(0,EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,0), "EC_POINT_set_compressed_coordinates_GFp"}, | 112 | {ERR_FUNC(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP), "EC_POINT_set_compressed_coordinates_GFp"}, |
109 | {ERR_PACK(0,EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP,0), "EC_POINT_set_Jprojective_coordinates_GFp"}, | 113 | {ERR_FUNC(EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP), "EC_POINT_set_Jprojective_coordinates_GFp"}, |
110 | {ERR_PACK(0,EC_F_EC_POINT_SET_TO_INFINITY,0), "EC_POINT_set_to_infinity"}, | 114 | {ERR_FUNC(EC_F_EC_POINT_SET_TO_INFINITY), "EC_POINT_set_to_infinity"}, |
111 | {ERR_PACK(0,EC_F_GFP_MONT_GROUP_SET_CURVE_GFP,0), "GFP_MONT_GROUP_SET_CURVE_GFP"}, | 115 | {ERR_FUNC(EC_F_GFP_MONT_GROUP_SET_CURVE_GFP), "GFP_MONT_GROUP_SET_CURVE_GFP"}, |
112 | {0,NULL} | 116 | {0,NULL} |
113 | }; | 117 | }; |
114 | 118 | ||
115 | static ERR_STRING_DATA EC_str_reasons[]= | 119 | static ERR_STRING_DATA EC_str_reasons[]= |
116 | { | 120 | { |
117 | {EC_R_BUFFER_TOO_SMALL ,"buffer too small"}, | 121 | {ERR_REASON(EC_R_BUFFER_TOO_SMALL) ,"buffer too small"}, |
118 | {EC_R_INCOMPATIBLE_OBJECTS ,"incompatible objects"}, | 122 | {ERR_REASON(EC_R_INCOMPATIBLE_OBJECTS) ,"incompatible objects"}, |
119 | {EC_R_INVALID_ARGUMENT ,"invalid argument"}, | 123 | {ERR_REASON(EC_R_INVALID_ARGUMENT) ,"invalid argument"}, |
120 | {EC_R_INVALID_COMPRESSED_POINT ,"invalid compressed point"}, | 124 | {ERR_REASON(EC_R_INVALID_COMPRESSED_POINT),"invalid compressed point"}, |
121 | {EC_R_INVALID_COMPRESSION_BIT ,"invalid compression bit"}, | 125 | {ERR_REASON(EC_R_INVALID_COMPRESSION_BIT),"invalid compression bit"}, |
122 | {EC_R_INVALID_ENCODING ,"invalid encoding"}, | 126 | {ERR_REASON(EC_R_INVALID_ENCODING) ,"invalid encoding"}, |
123 | {EC_R_INVALID_FIELD ,"invalid field"}, | 127 | {ERR_REASON(EC_R_INVALID_FIELD) ,"invalid field"}, |
124 | {EC_R_INVALID_FORM ,"invalid form"}, | 128 | {ERR_REASON(EC_R_INVALID_FORM) ,"invalid form"}, |
125 | {EC_R_NOT_INITIALIZED ,"not initialized"}, | 129 | {ERR_REASON(EC_R_NOT_INITIALIZED) ,"not initialized"}, |
126 | {EC_R_POINT_AT_INFINITY ,"point at infinity"}, | 130 | {ERR_REASON(EC_R_POINT_AT_INFINITY) ,"point at infinity"}, |
127 | {EC_R_POINT_IS_NOT_ON_CURVE ,"point is not on curve"}, | 131 | {ERR_REASON(EC_R_POINT_IS_NOT_ON_CURVE) ,"point is not on curve"}, |
128 | {EC_R_SLOT_FULL ,"slot full"}, | 132 | {ERR_REASON(EC_R_SLOT_FULL) ,"slot full"}, |
129 | {EC_R_UNDEFINED_GENERATOR ,"undefined generator"}, | 133 | {ERR_REASON(EC_R_UNDEFINED_GENERATOR) ,"undefined generator"}, |
130 | {EC_R_UNKNOWN_ORDER ,"unknown order"}, | 134 | {ERR_REASON(EC_R_UNKNOWN_ORDER) ,"unknown order"}, |
131 | {0,NULL} | 135 | {0,NULL} |
132 | }; | 136 | }; |
133 | 137 | ||
@@ -141,8 +145,8 @@ void ERR_load_EC_strings(void) | |||
141 | { | 145 | { |
142 | init=0; | 146 | init=0; |
143 | #ifndef OPENSSL_NO_ERR | 147 | #ifndef OPENSSL_NO_ERR |
144 | ERR_load_strings(ERR_LIB_EC,EC_str_functs); | 148 | ERR_load_strings(0,EC_str_functs); |
145 | ERR_load_strings(ERR_LIB_EC,EC_str_reasons); | 149 | ERR_load_strings(0,EC_str_reasons); |
146 | #endif | 150 | #endif |
147 | 151 | ||
148 | } | 152 | } |