Mercurial > dropbear

comparison signkey.c @ 586:b50f0107e505

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename rsa_key to dropbear_rsa_key (and same for dss too) so we don't conflict with libtomcrypt.
author Matt Johnston <matt@ucc.asn.au>
date Wed, 21 Jul 2010 12:55:25 +0000
parents 52d7301e46bd
children a98a2138364a
comparison
equal deleted inserted replaced
585:d194db6f9453 586:b50f0107e505
117 buf_incrpos(buf, -len - 4); 117 buf_incrpos(buf, -len - 4);
118 118
119 #ifdef DROPBEAR_DSS 119 #ifdef DROPBEAR_DSS
120 if (keytype == DROPBEAR_SIGNKEY_DSS) { 120 if (keytype == DROPBEAR_SIGNKEY_DSS) {
121 dss_key_free(key->dsskey); 121 dss_key_free(key->dsskey);
122 key->dsskey = (dss_key*)m_malloc(sizeof(dss_key)); 122 key->dsskey = m_malloc(sizeof(*key->dsskey));
123 ret = buf_get_dss_pub_key(buf, key->dsskey); 123 ret = buf_get_dss_pub_key(buf, key->dsskey);
124 if (ret == DROPBEAR_FAILURE) { 124 if (ret == DROPBEAR_FAILURE) {
125 m_free(key->dsskey); 125 m_free(key->dsskey);
126 } 126 }
127 } 127 }
128 #endif 128 #endif
129 #ifdef DROPBEAR_RSA 129 #ifdef DROPBEAR_RSA
130 if (keytype == DROPBEAR_SIGNKEY_RSA) { 130 if (keytype == DROPBEAR_SIGNKEY_RSA) {
131 rsa_key_free(key->rsakey); 131 rsa_key_free(key->rsakey);
132 key->rsakey = (rsa_key*)m_malloc(sizeof(rsa_key)); 132 key->rsakey = m_malloc(sizeof(*key->rsakey));
133 ret = buf_get_rsa_pub_key(buf, key->rsakey); 133 ret = buf_get_rsa_pub_key(buf, key->rsakey);
134 if (ret == DROPBEAR_FAILURE) { 134 if (ret == DROPBEAR_FAILURE) {
135 m_free(key->rsakey); 135 m_free(key->rsakey);
136 } 136 }
137 } 137 }
170 buf_incrpos(buf, -len - 4); 170 buf_incrpos(buf, -len - 4);
171 171
172 #ifdef DROPBEAR_DSS 172 #ifdef DROPBEAR_DSS
173 if (keytype == DROPBEAR_SIGNKEY_DSS) { 173 if (keytype == DROPBEAR_SIGNKEY_DSS) {
174 dss_key_free(key->dsskey); 174 dss_key_free(key->dsskey);
175 key->dsskey = (dss_key*)m_malloc(sizeof(dss_key)); 175 key->dsskey = m_malloc(sizeof(*key->dsskey));
176 ret = buf_get_dss_priv_key(buf, key->dsskey); 176 ret = buf_get_dss_priv_key(buf, key->dsskey);
177 if (ret == DROPBEAR_FAILURE) { 177 if (ret == DROPBEAR_FAILURE) {
178 m_free(key->dsskey); 178 m_free(key->dsskey);
179 } 179 }
180 } 180 }
181 #endif 181 #endif
182 #ifdef DROPBEAR_RSA 182 #ifdef DROPBEAR_RSA
183 if (keytype == DROPBEAR_SIGNKEY_RSA) { 183 if (keytype == DROPBEAR_SIGNKEY_RSA) {
184 rsa_key_free(key->rsakey); 184 rsa_key_free(key->rsakey);
185 key->rsakey = (rsa_key*)m_malloc(sizeof(rsa_key)); 185 key->rsakey = m_malloc(sizeof(*key->rsakey));
186 ret = buf_get_rsa_priv_key(buf, key->rsakey); 186 ret = buf_get_rsa_priv_key(buf, key->rsakey);
187 if (ret == DROPBEAR_FAILURE) { 187 if (ret == DROPBEAR_FAILURE) {
188 m_free(key->rsakey); 188 m_free(key->rsakey);
189 } 189 }
190 } 190 }