Deleted Added
full compact
key.c (126277) key.c (137019)
1/*
2 * read_bignum():
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be

--- 18 unchanged lines hidden (view full) ---

27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34#include "includes.h"
1/*
2 * read_bignum():
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 *
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be

--- 18 unchanged lines hidden (view full) ---

27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */
34#include "includes.h"
35RCSID("$OpenBSD: key.c,v 1.55 2003/11/10 16:23:41 jakob Exp $");
35RCSID("$OpenBSD: key.c,v 1.56 2004/07/28 09:40:29 markus Exp $");
36
37#include <openssl/evp.h>
38
39#include "xmalloc.h"
40#include "key.h"
41#include "rsa.h"
42#include "uuencode.h"
43#include "buffer.h"

--- 733 unchanged lines hidden (view full) ---

777 switch (key->type) {
778 case KEY_DSA:
779 return ssh_dss_sign(key, sigp, lenp, data, datalen);
780 break;
781 case KEY_RSA:
782 return ssh_rsa_sign(key, sigp, lenp, data, datalen);
783 break;
784 default:
36
37#include <openssl/evp.h>
38
39#include "xmalloc.h"
40#include "key.h"
41#include "rsa.h"
42#include "uuencode.h"
43#include "buffer.h"

--- 733 unchanged lines hidden (view full) ---

777 switch (key->type) {
778 case KEY_DSA:
779 return ssh_dss_sign(key, sigp, lenp, data, datalen);
780 break;
781 case KEY_RSA:
782 return ssh_rsa_sign(key, sigp, lenp, data, datalen);
783 break;
784 default:
785 error("key_sign: illegal key type %d", key->type);
785 error("key_sign: invalid key type %d", key->type);
786 return -1;
787 break;
788 }
789}
790
791/*
792 * key_verify returns 1 for a correct signature, 0 for an incorrect signature
793 * and -1 on error.

--- 10 unchanged lines hidden (view full) ---

804 switch (key->type) {
805 case KEY_DSA:
806 return ssh_dss_verify(key, signature, signaturelen, data, datalen);
807 break;
808 case KEY_RSA:
809 return ssh_rsa_verify(key, signature, signaturelen, data, datalen);
810 break;
811 default:
786 return -1;
787 break;
788 }
789}
790
791/*
792 * key_verify returns 1 for a correct signature, 0 for an incorrect signature
793 * and -1 on error.

--- 10 unchanged lines hidden (view full) ---

804 switch (key->type) {
805 case KEY_DSA:
806 return ssh_dss_verify(key, signature, signaturelen, data, datalen);
807 break;
808 case KEY_RSA:
809 return ssh_rsa_verify(key, signature, signaturelen, data, datalen);
810 break;
811 default:
812 error("key_verify: illegal key type %d", key->type);
812 error("key_verify: invalid key type %d", key->type);
813 return -1;
814 break;
815 }
816}
817
818/* Converts a private to a public key */
819Key *
820key_demote(const Key *k)

--- 38 unchanged lines hidden ---
813 return -1;
814 break;
815 }
816}
817
818/* Converts a private to a public key */
819Key *
820key_demote(const Key *k)

--- 38 unchanged lines hidden ---